aboutsummaryrefslogtreecommitdiff
path: root/gui/gui-manager.cpp
AgeCommit message (Collapse)Author
2011-06-01Merge branch 'branch-1-3-0' into masterMax Horn
I manually resolved all conflicts, and inspected every single change. Many were due to the version string mismatch and thus easily resolved. The MSVC project files add in the 1-3-0 branch were not merged, neither where the changes to gui/themes/translations.dat. Conflicts: NEWS backends/base-backend.cpp backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp backends/module.mk backends/platform/ds/arm9/makefile backends/platform/psp/README.PSP backends/platform/samsungtv/main.cpp backends/platform/samsungtv/samsungtv.cpp backends/saves/posix/posix-saves.cpp base/commandLine.cpp base/internal_version.h base/main.cpp common/array.h configure devtools/create_project/create_project.cpp dists/android/AndroidManifest.xml dists/android/plugin-manifest.xml dists/iphone/Info.plist dists/irix/scummvm.spec dists/macosx/Info.plist dists/redhat/scummvm-tools.spec dists/redhat/scummvm.spec dists/scummvm.rc dists/slackware/scummvm.SlackBuild dists/wii/meta.xml engines/sci/parser/vocabulary.cpp engines/tinsel/handle.cpp gui/themes/translations.dat
2011-05-25ALL: behaviour -> behaviorMatthew Hoops
2011-05-21DS: Port of changes from branch-1-2-0 that I should really have moved into ↵agent-q
the trunk. "DS: Prevent the command line help string from being included in the binary." 5f3a90a5f6911188b8d1ded08dbdf6d233e9eb7b "GUI: Allow disabling of Mass Add dialog. Saves a few Kb of binary size on the DS, and is not particularly useful on that platform." 240ff87cf4472538d25a1c5628c8d15f1791ab1c "GUI: Don't search for theme zip files on startup when running on the DS. Themes aren't supported anyway, and the search severely delays startup." fe3b18ce0df03117081e83d99f4a2cbd864d3286
2011-05-12GIT: Clean up: Suppress SVN tags, now uselessstrangerke
2011-04-28JANITORIAL: Reduce header dependencies in shared codeOri Avtalion
Some backends may break as I only compiled SDL
2011-04-05GUI: Update the screen after handling eventsdhewg
Fixes crash on droid: game -> gmm -> save -> click entry (EVENT_SCREEN_CHANGED due to vkeybd beeing shown) -> delete -> confirm another EVENT_SCREEN_CHANGED gets in simultaneously (due vkeybd being deactivated) and the parent dialog updated Rects out of bounds.
2011-02-24GUI: Fix two-step renderingdhewg
This is used when changing directories in the 'add game' dialog or when choosing another tab in the option dialog. Only blit to the overlay on the final pass. Gets rid of highly annoying flickers on androids
2011-02-14GUI: Update cursor palette handling for RGBA->RGB change.Johannes Schickel
2010-11-30I18N: Don't build TranslationManager when translation is disabled.Jordi Vilalta Prat
svn-id: r54684
2010-11-18GUI: Make activeDialog in runLoop const, since it should not be changed.Johannes Schickel
svn-id: r54346
2010-11-18GUI: Simplify Tooltip implementation.Johannes Schickel
Formerly there was much special handling for the Tooltip dialog in GuiManager::runLoop. This was replaced by overloading the event handling functions in Tooltip. Also the Tooltip was adapted to be run like every other normal dialog. svn-id: r54337
2010-11-18GUI: changed tooltip to be deleted when inactiveYotam Barnoy
Before, it could be instantiated after an engine loaded and then was never deleted, causing memory fragmentation. Also removed inner tooltip call to the GuiManager runloop, which makes the logic simpler since the tooltip is a bit of a hack. I had to remove it because deleting _tooltip in the inner loop (called from tooltip itself) is trouble. svn-id: r54311
2010-11-16GUI: Push down some header (inter)dependenciesMax Horn
svn-id: r54267
2010-11-16GUI: Commit some changes missing in my previous commit (oops)Max Horn
svn-id: r54266
2010-11-16GUI: Rename gui/GuiManager.* to gui/gui-manager.*Max Horn
svn-id: r54265
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 04:14:38 +0000