libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-15 05:00:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
141,592 Commits 6 Branches 5 Tags
Commit Graph

328 Commits

Author SHA1 Message Date
Max Horn
a882a6f467 GUI: Replaced ThemeParser::_drawFunction hashmap by a static function getDrawingFunctionCallback which maps strings to draw funcs 
svn-id: r41931
 2009-06-28 19:57:27 +00:00
Jody Northup
865129a563 made the cursor's pixel format a member of the cursor object, merged ____CursorFormat functions into equivalent ____Cursor functions. 
svn-id: r41825
 2009-06-24 06:44:30 +00:00
Jody Northup
f7dd1c15ed renamed ENABLE_16BIT define to more accurate ENABLE_RGB_COLOR 
svn-id: r41696
 2009-06-20 05:23:09 +00:00
Jody Northup
6f2b46964b Fixed error with non-animated 8-bit GUI cursors being drawn incorrectly in debug console of 16-bit games. 
svn-id: r41627
 2009-06-18 07:31:09 +00:00
Jody Northup
350dc4290f Fixed cursor code to keep track of cursor formats so that ThemeEngine and/or GuiManager cursors will render properly over the game (on spacebar hit, for instance) 
svn-id: r41491
 2009-06-13 10:24:52 +00:00
Max Horn
8a0c5753f3 GUI: Simplified ThemeEngine::getImageSurface (this way it's easier to add more graphics in the future ;) 
svn-id: r41309
 2009-06-06 23:22:22 +00:00
Eugene Sandulenko
a3b6b0efb5 Make PopUp widget look more balanced 
svn-id: r41261
 2009-06-06 17:48:46 +00:00
Jody Northup
56e5920bba Corrected cursor display errors introduced by revision 41204, reimplemented 16-bit cursor support in a less hacky, but still temporary way. 
svn-id: r41209
 2009-06-06 01:16:04 +00:00
Jody Northup
d65bbe1d7a Fixes ScummEngine_v70he::setDefaultCursor to work in 16-bit, using a temporary hack. 
svn-id: r41204
 2009-06-05 23:59:40 +00:00
Johannes Schickel
b3c6751b9b Strip trailing whitespaces in the whole code base. 
svn-id: r40867
 2009-05-24 15:17:42 +00:00
Max Horn
0c8ffc80fd GUI: Fixed nasty typo 
svn-id: r39913
 2009-04-10 14:06:21 +00:00
Max Horn
9d4c917f59 GUI: Rewrote the dirty rect handling code. Previously it was possible that the dirty rect list got clobbered by many rects containg other rects in the list. Also got rid of some obsolete params to addDirtyRect as well as the obsolete return value 
svn-id: r39909
 2009-04-09 17:07:38 +00:00
Max Horn
5181546c63 Rewrote Common::List iterator code to ensure const correctness is preserved. 
We tried to implement the list iterators in a clever way, to reduce code
duplication. But this is essentially impossible to do properly, sadly --
this is one of the places where the ugly drawbacks of C++ really show.
As a consequence, our implementation had a bug which allowed one to
convert any const_iterator to an iterator, thus allowing modifying
elements of const lists.

This rewrite reintroduces code duplication but at least ensures that no
const list is written to accidentally.

Also fix some places which incorrectly used iterator instead of const_iterator
or (in the kyra code) accidentally wrote into a const list.

svn-id: r39279
 2009-03-09 22:26:02 +00:00
Oystein Eftevaag
5b86801553 Merged revisions 36329, 38212, 38226and 38234 from branch-0-13-0 to trunk: iPhone backend updates 
svn-id: r38240
 2009-02-15 13:58:15 +00:00
Vicent Marti
341873c9d3 Third attemp at fixing release-critical #2472185. Also fixes regression reported in #2555710. 
svn-id: r36227
 2009-02-07 00:23:53 +00:00
Max Horn
5556fc7f72 Changed Graphics::ImageDecoder to allow custom PixelFormats 
svn-id: r36026
 2009-01-23 23:50:54 +00:00
Max Horn
14c5bbbccf Renamed Archive::openFile to createReadStreamForMember 
svn-id: r36021
 2009-01-23 04:45:44 +00:00
Max Horn
9861afd8fd Renamed ArchiveMember::open -> createReadStream, and made it a cv member (const); same for Archive::openFile 
svn-id: r36020
 2009-01-23 04:36:18 +00:00
Max Horn
cc1efb9137 Fix buggy images in GUI when switching overlay mode (e.g. on Mac OS X when toggline full screen and windowed mode) 
svn-id: r36001
 2009-01-22 18:45:06 +00:00
Max Horn
abc06ca18e Moved Graphics::PixelFormat into its own header file; turned RGBToColor etc. into methods, and added an operator== 
svn-id: r35993
 2009-01-22 04:35:10 +00:00
Max Horn
c9e97bf6f9 GUI: Some cleanup and renaming; moved some parsing code from ThemeEngine to ThemeParser 
svn-id: r35898
 2009-01-18 14:48:00 +00:00
Max Horn
20dad9e967 Merged gui/ThemeData.cpp into ThemeEngine.cpp 
svn-id: r35881
 2009-01-17 17:13:04 +00:00
Max Horn
42d4ddf934 Removed unused & incomplete widget caching code 
svn-id: r35880
 2009-01-17 16:57:50 +00:00
Jordi Vilalta Prat
ab82db8f86 Use the current palette size for the theme mouse cursor instead of using the maximum (fixes a valgrind warning) 
svn-id: r35857
 2009-01-14 02:44:09 +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
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
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
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
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
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
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
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
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
Johannes Schickel
ff45c8aa65 Added FIXME in ThemeEngine::drawSlider. 
svn-id: r35515
 2008-12-24 00:05:42 +00:00
Jordi Vilalta Prat
b1999a2a16 Fixed indentation and removed whitespaces at the end of line 
svn-id: r35481
 2008-12-22 11:22:15 +00:00
Jordi Vilalta Prat
2ec51ef358 Allow the disabled state of the popup widget to be themed 
svn-id: r35480
 2008-12-22 10:31:01 +00:00
Max Horn
a28b531ed0 Added ArchiveMember::getDisplayName() method; changed ArchiveMember::getName() to always return a name compatible with Archive::openFile() 
svn-id: r35139
 2008-11-21 12:17:35 +00:00
Johannes Schickel
4368081c55 Fixed ZipArchive/FSDirectory creation. 
svn-id: r35133
 2008-11-20 18:25:22 +00:00
Max Horn
f974a6c8d5 GUI: Blitting the full screen to the backbuffer (or vice versa) can be done with a single memcpy, which is a bit faster than using _vectorRenderer->blitSurface 
svn-id: r35029
 2008-11-12 22:23:19 +00:00
Max Horn
c0f82d3518 Renamed Graphics::TextAlignment -> Graphics::TextAlign and merged it with GUI::ThemeEngine::TextAlignVertical 
svn-id: r35023
 2008-11-12 14:30:16 +00:00
Max Horn
32526079aa Include required header 
svn-id: r34985
 2008-11-10 12:45:09 +00:00
Vicent Marti
b98f89c7f0 Merged GUI::Theme and Gui::ThemeEngine into the same class, GUI::ThemeEngine. 
Massive cleanup.

svn-id: r34983
 2008-11-10 11:24:55 +00:00
Max Horn
f5b70114ca Removed many unnecessary #includes 
svn-id: r34959
 2008-11-09 15:14:01 +00:00
Max Horn
7cbd04dc23 Thou shalst never use the 'using' keyword in a header file, lest the wrath of ye fingolfin will crush your sorrow bones to dust... *grrr* ;) 
svn-id: r34937
 2008-11-08 01:34:02 +00:00