diff options
| author | Johannes Schickel | 2013-07-04 23:30:22 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2013-07-04 23:33:02 +0200 |
| commit | be61cb669a5d6de733c9a42b3714de3750e5f2e3 (patch) | |
| tree | 0d83ab94ac7895c1a5f7f75a623a5be135230d2d /gui | |
| parent | d089658fb84f67652e9569bc03c76bcc65e7b881 (diff) | |
| parent | be399188c4ec25463c4a777a5e96fd69a4b0b1e3 (diff) | |
| download | scummvm-rg350-be61cb669a5d6de733c9a42b3714de3750e5f2e3.tar.gz scummvm-rg350-be61cb669a5d6de733c9a42b3714de3750e5f2e3.tar.bz2 scummvm-rg350-be61cb669a5d6de733c9a42b3714de3750e5f2e3.zip | |
Merge pull request #350 from chrisws/tizen_port_1_6_0a
TIZEN: bada port updated to tizen
Conflicts:
backends/platform/tizen/system.cpp
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/credits.h | 6 | ||||
| -rw-r--r-- | gui/widgets/edittext.cpp | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/gui/credits.h b/gui/credits.h index 81d46b2b73..70f79ac9a5 100644 --- a/gui/credits.h +++ b/gui/credits.h @@ -294,9 +294,6 @@ static const char *credits[] = { "C0""Andre Heider", "C0""Angus Lees", "", -"C1""BADA", -"C0""Chris Warren-Smith", -"", "C1""Dreamcast", "C0""Marcus Comstedt", "", @@ -352,6 +349,9 @@ static const char *credits[] = { "C0""Jurgen Braam", "C0""Lars Persson", "", +"C1""Tizen / BADA", +"C0""Chris Warren-Smith", +"", "C1""WebOS", "C0""Klaus Reimer", "", diff --git a/gui/widgets/edittext.cpp b/gui/widgets/edittext.cpp index 4b266e8194..3677f02e47 100644 --- a/gui/widgets/edittext.cpp +++ b/gui/widgets/edittext.cpp @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "common/system.h" #include "gui/widgets/edittext.h" #include "gui/gui-manager.h" @@ -79,8 +80,13 @@ void EditTextWidget::handleMouseDown(int x, int y, int button, int clickCount) { } if (setCaretPos(i)) draw(); -} +#ifdef TIZEN + // Display the virtual keypad to allow text entry. Samsung app-store testers expected + // the keypad to be displayed when clicking the filter edit control in the laucher gui. + g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true); +#endif +} void EditTextWidget::drawWidget() { g_gui.theme()->drawWidgetBackground(Common::Rect(_x, _y, _x+_w, _y+_h), 0, ThemeEngine::kWidgetBackgroundEditText); |