libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-22 18:02:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
28,451 Commits 5 Branches 5 Tags 1.8 GiB
e399865ee8
Commit Graph

1538 Commits

Author SHA1 Message Date
Eugene Sandulenko
83972e2001 Merge in Virtual Keybpard & KeyMapper branch, 
- Merge is perfromed in order to not let rotting the code
- Makefile modifications were avoided

Stuff to resolve:
- Circular dependency of common/vkeybd from graphics/
- Make it compilable (?)
- Add some keyboards
- Decide on the key bindings

svn-id: r35813
 2009-01-11 00:20:27 +00:00
Torbjörn Andersson
20638a0f97 Moved some stuff from the EditGameDialog constructor to its open() method to 
avoid uninitialised variables. (This is similar to some bugs that were fixed
earlier today.)

svn-id: r35811
 2009-01-10 23:38:30 +00:00
Eugene Sandulenko
b4eb116f65 Update Joachim's role as requested by him. 
svn-id: r35809
 2009-01-10 23:13:43 +00:00
Willem Jan Palenstijn
0ab01c756a open browser dialog before manipulating it (fixes assert when pressing 'add game') 
svn-id: r35807
 2009-01-10 22:31:15 +00:00
Vicent Marti
d638ddd3d6 Fixed release critical bug #2472185. All transparent buttons should now properly refresh their text when changed between redrawing frames. This includes the launcher "Add game" button and the options "subtitle mode" button. 
svn-id: r35789
 2009-01-08 18:09:13 +00:00
Johannes Schickel
23f23d7491 Fixed revertion to "Add game" button string after a "Mass add" was processed. 
svn-id: r35788
 2009-01-08 17:08:24 +00:00
Max Horn
e668574d88 Tweak gui/ThemeData.* to not produce errors on certain system like Haiku (at least I hope this will work :) 
svn-id: r35743
 2009-01-05 19:54:10 +00:00
Johannes Schickel
ec631ba7f1 - Prevented full theme search when "builtin" theme was specified 
- Only do a recursive search for themes with depth 1 in '.'

svn-id: r35706
 2009-01-03 16:24:10 +00:00
Max Horn
6a7e4e3c15 Fix compilation on Mac OS X; tiny simplification 
svn-id: r35688
 2009-01-02 22:29:13 +00:00
Johannes Schickel
3558cf0e5e Cleanup. 
svn-id: r35687
 2009-01-02 22:16:33 +00:00
Johannes Schickel
95074af35c Fixed crash when returning to launcher from a 640x480 game running with a non 1x scaler. 
svn-id: r35686
 2009-01-02 22:10:00 +00:00
Johannes Schickel
1d2c446395 - Moved theme listing code from GuiManager to ThemeEngine 
- Only show builtin theme in theme list if GUI_ENABLE_BUILTIN_THEME is defined
- Introduced _themeFile to ThemeEngine again and changed _themeId to store the basename of the theme

svn-id: r35684
 2009-01-02 21:24:13 +00:00
Johannes Schickel
6fd559b4f6 - Fixed --gui-theme command line description 
- Added --list-themes command line command to list available GUI themes

svn-id: r35681
 2009-01-02 20:21:21 +00:00
Johannes Schickel
1b0f945471 - Added support selection of themes via a basename again (This should fix bugs #2473213 "GUI: Theme selection oddities and regressions" and #2219605 "GUI: theme detection") 
- Changed default value to "scummmodern" instead of "scummmodern.zip" for "gui_theme"
- Moved theme listing code from ThemeBrowser to GuiManager

svn-id: r35680
 2009-01-02 20:03:45 +00:00
Johannes Schickel
690b88f982 Renamed gui/newgui.cpp -> gui/GuiManager.cpp and gui/newgui.h -> gui/GuiManager.h 
svn-id: r35668
 2009-01-02 03:21:40 +00:00
Johannes Schickel
4ec7876972 Reverted the handling of mouse move events, now the slider widget should be highlighted correctly again. 
svn-id: r35667
 2009-01-02 03:03:06 +00:00
Johannes Schickel
1b41a49fc5 Modified the way button highlights are processed when a widget is in dragging mode. This allows for example unhighlighting of a button when the user clicked on it but moved the mouse away. 
svn-id: r35666
 2009-01-02 02:48:06 +00:00
Max Horn
8260944260 GUI: Redraw screen ASAP if the theme was changed 
svn-id: r35665
 2009-01-02 01:36:38 +00:00
Max Horn
903f52cff8 GUI: Create the _themeArchive once and then keep it; also do not reload theme bitmaps needlessly 
svn-id: r35663
 2009-01-02 01:32:40 +00:00
Johannes Schickel
e7bf64744b Got rid of GuiManager::clearDragWidget instead handle it via a new widget flag WIDGET_IGNORE_DRAG. 
svn-id: r35662
 2009-01-02 01:31:46 +00:00
Max Horn
e6b9a3e476 GUI: Fix the recent regression where starting games directly (bypassing the launcher) would result in a black screen; also reinit the theme (which each time causes the full XML data to be parsed) less often 
svn-id: r35661
 2009-01-02 01:23:17 +00:00
Torbjörn Andersson
685f1f985f Fixed a typo in a comment, plus some slight re-wording. 
svn-id: r35655
 2009-01-01 22:15:21 +00:00
Max Horn
3851bda05f cleanup 
svn-id: r35654
 2009-01-01 21:52:15 +00:00
Max Horn
97e9b28c8a Revamping the handling of GUI themes a bit: 
* Moved the code which handles fallback to the built-in theme from ThemeEngine to GuiManager
* Changed ThemeEngine::init() to only init&load the theme; no more messing with the overlay
* Commented to a somewhat obscure line in the GuiManager event loop (taking eriktorbjorn's original commit message for that change as comment text)
* Cleaned up the way the Dialog constructor ensures that the current Theme is correctly setup
* Got rid of varios members of ThemeEngine
* Changed ThemeEngine members _screen and _backBuffer from Surface pointers to just plain Surfaces
* Changed ThemeEngine::loadFontFromArchive to use _themeArchive instead of creating an Archive from scratch
* Renamed ThemeEngine::getThemeFileName() to getThemeId() (and some associated tweaks)
* Lots of further cleanup and tweaks

svn-id: r35653
 2009-01-01 21:41:55 +00:00
Max Horn
c62efbcab3 Added two FIXMEs to global options dialog, related to theme selection 
svn-id: r35650
 2009-01-01 17:02:45 +00:00
Eugene Sandulenko
696897b058 Whoa! Removing trailing spaces. 
svn-id: r35648
 2009-01-01 15:06:43 +00:00
Jordi Vilalta Prat
05d3633eb3 Restore the text background of pop-up widgets to fix the glitch on classic theme when changing the option with the mouse wheel 
svn-id: r35647
 2009-01-01 08:14:43 +00:00
Max Horn
167a9cb767 ThemeEngine: 
* more cleanup, esp. of Doxygen comments
* completely got rid of ImageMan, instead use the same Common::Archive to load bitmaps and XML data from

svn-id: r35636
 2008-12-31 15:07:30 +00:00
Max Horn
693b9df098 cleanup 
svn-id: r35635
 2008-12-31 15:03:17 +00:00
Filippos Karapetis
587a691b12 Proper fix: Readded the const keyword, together with the missing data type in ThemeEngine.h 
svn-id: r35634
 2008-12-31 14:54:30 +00:00
Filippos Karapetis
9f0a401047 Removed "const" keyword from kDrawDataDefaults. MSVC complains that "'const' static/global data initialized with compiler generated default constructor fills the object with zeros", in ThemeEngine.h line 123 
svn-id: r35632
 2008-12-31 14:37:22 +00:00
Max Horn
be73014f67 ThemeEngine changes: 
* removed lots of dead code / methods
* fixed bad Doxygen comments (they were attached to the wrong member variables)
* some cleanup

svn-id: r35631
 2008-12-31 14:10:23 +00:00
Vicent Marti
a4f2be4638 Fix for ""LAUNCHER: "(Mass) Add" buttons + built-in GUI = buggy"" (bug ID 2472185) 
svn-id: r35617
 2008-12-29 20:33:09 +00:00
Vicent Marti
49976794c4 Updated Theme Package generator to work with Python 2.6-3.0 (push Python forward!) 
svn-id: r35613
 2008-12-29 16:22:52 +00:00
Vicent Marti
e432dad215 Changed PSP graphic modes to use low resolution themes (possible fix for bug ID 2458134) 
svn-id: r35612
 2008-12-29 16:17:51 +00:00
Kostas Nakos
25ac7c7fb0 1) Add the KeysDialog layout to the modern theme. 2) Improve somewhat the layout of the KeysDialog 
svn-id: r35592
 2008-12-28 20:15:00 +00:00
Torbjörn Andersson
ab2297e28b Made the F6 and F5 (SCUMM only) menus fit in 320x200. I'd appreciate if someone 
who's more familiar with this could look at my changes, in case I messed up.

svn-id: r35589
 2008-12-28 16:53:57 +00:00
Max Horn
c5cabc7b2a Renamed some stuff 
svn-id: r35574
 2008-12-27 16:09:08 +00:00
Max Horn
1d099c0d40 GuiManager::runLoop: do not call OSystem::quit() when receiving EVENT_QUIT, just return to the caller instead 
svn-id: r35573
 2008-12-27 16:07:10 +00:00
Max Horn
f26f85ee96 GUI: Added Widget::setVisible convenience wrapper 
svn-id: r35572
 2008-12-27 14:36:28 +00:00
Max Horn
69f4b7a383 Got rid of ThemeLayout::getDialogData; added some comments, asserts; moved getParentW & getParentH to class ThemeLayoutStacked 
svn-id: r35571
 2008-12-27 14:30:30 +00:00
Jordi Vilalta Prat
d18d2d72a8 Fix for the SliderWidget glitch when showing very small values (and potentially for other small widgets) 
svn-id: r35557
 2008-12-26 12:15:51 +00:00
Max Horn
751df013e1 If more than 8 items have to be resized in a stacked theme layout, abort with an error (instead of silently trashing the stack) 
svn-id: r35549
 2008-12-26 01:13:08 +00:00
Max Horn
131cb5a05a Merged ThemeLayoutHorizontal and ThemeLayoutVertical into a new class ThemeLayoutStacked (suggestions for a better name are welcome); stored padding data in a Common::Rect 
svn-id: r35548
 2008-12-26 01:08:49 +00:00
Max Horn
c59f5919a2 ThemeLayout::getParentW was calling getHeight instead of getWidth by mistake (though this didn't seem to cause any problems anywhere... ?) 
svn-id: r35547
 2008-12-26 00:57:30 +00:00
Max Horn
c9105aa58f Fix for bug #2210082: GUI: Crash in GMM when changing scale factor 
svn-id: r35546
 2008-12-26 00:43:52 +00:00
Max Horn
c3aec16033 Some 'cleanup' of Gui::ThemeLayout 
svn-id: r35545
 2008-12-26 00:26:34 +00:00
Max Horn
6510226216 Renamed NewGui to GuiManager 
svn-id: r35544
 2008-12-25 23:55:36 +00:00
Jordi Vilalta Prat
bce76931d3 Added valueToBarWidth to calculate SliderWidget's bar width like it was done before (as discussed with LordHoto) 
svn-id: r35519
 2008-12-24 01:11:58 +00:00
Max Horn
1c238fe1e1 Removed Ender from SCUMM credits (matching other retired team members, like ludde and yazor) 
svn-id: r35517
 2008-12-24 00:18:46 +00:00