Commit Graph

64 Commits

Author SHA1 Message Date
Johannes Schickel
956affd3d2 Moved definition of ThemeClassic and ThemeModern to their own files.
svn-id: r25432
2007-02-08 23:25:07 +00:00
Johannes Schickel
b274881086 - changed the way how gradients are calculated
- bumped theme version

svn-id: r25369
2007-02-04 00:42:10 +00:00
Johannes Schickel
d66d2ab71b Changed _imageHandels into an array.
svn-id: r25363
2007-02-03 21:50:51 +00:00
Max Horn
56b00f05cc Replaced 'typedef Common::String String' with explicit usages of Common::String (mainly to make doxygen happy)
svn-id: r25360
2007-02-03 21:32:18 +00:00
Eugene Sandulenko
4e52f4438f Fix bug #1595627: "SCUMM: F5 crashes game (640x480)". This partially
reverts commit r24656 for fixing bug #1590596 and effectively fixes both.

svn-id: r24933
2006-12-27 00:47:57 +00:00
Johannes Schickel
77e40457a8 - Fix crash if theme_logo.visible is set to true in a classic theme config file
svn-id: r24513
2006-10-25 21:49:33 +00:00
Johannes Schickel
6e16df7891 - renamed GUI::ThemeNew to GUI::ThemeModern
- renamed ThemeNew.cpp to ThemeModern.cpp

svn-id: r24512
2006-10-25 21:20:31 +00:00
Johannes Schickel
7721c0d039 Make modern and classic theme config files use the same version number.
svn-id: r24236
2006-10-08 21:03:19 +00:00
Johannes Schickel
16276155b6 Adding option to enable/disable blending for the classic theme.
svn-id: r24234
2006-10-08 20:46:09 +00:00
Johannes Schickel
3e59682e34 Displaying the theme name instead of the theme config file name in the 'Misc' section of the Options dialog.
svn-id: r24231
2006-10-08 20:08:00 +00:00
Johannes Schickel
3a81941981 - Added dialog for selecting the theme to use
- Added runtime theme switching

svn-id: r24213
2006-10-08 18:22:28 +00:00
Johannes Schickel
25486c789e - added auto detection of the Theme style to use
- fixed a bug which would lead to a crash when loading the modern theme config with the classic theme

svn-id: r24201
2006-10-08 12:00:19 +00:00
Johannes Schickel
5e5a221b0e - added config file support for the classic theme
- added a sample config file (called 'classic.ini', which is based on Theme::_defaultConfigINI)
- added check for the type of the theme config file ('modern' and 'classic' for the respective Theme classes)
- bumped theme config version for the modern theme

svn-id: r24199
2006-10-08 10:57:48 +00:00
Johannes Schickel
c9245a0ffe Uses the slider background settings instead of the edit text widget settings for the slider background.
svn-id: r24187
2006-10-08 01:05:10 +00:00
Johannes Schickel
84b54c3173 - Adds 'THEME_HINT_NO_BACKGROUND_RESTORE' for buttons which don't want restored background (example: the tab scrolling buttons).
- Call _theme->drawAll() at the end of the redraw method of NewGui

svn-id: r23134
2006-06-15 14:25:59 +00:00
Eugene Sandulenko
021159724d Fix drawing of tab widget. Now it matches mock-ups. Added tab scrolling.
svn-id: r23116
2006-06-15 02:14:40 +00:00
Johannes Schickel
793151a0aa Implements new Tab drawing for modern theme (nearlly matches mockups now)
svn-id: r23106
2006-06-14 16:29:56 +00:00
Torbjörn Andersson
8ef6ff1765 This may cut down a little on unnecessary strings / mallocs:
* Only create the self.[xywh] aliases and its variables if prefixedname has no
  periods in it, e.g. MusicText.x, but not MusicText.align.x

* Set the .r, .g and .b variables directly, rather than aliasing them through
  .x, .y and .w

svn-id: r23000
2006-06-10 10:09:40 +00:00
Eugene Sandulenko
6f8c4250f9 Move whole theme ini file to evaluator. Next step is caching. Also now it is
possible to use per-resolution gfx and colors, i.e. complete customization.

svn-id: r22964
2006-06-06 23:57:14 +00:00
Max Horn
110718603c Fixing some more typenames to comply to the ScummVM coding guidelines
svn-id: r22929
2006-06-05 12:29:21 +00:00
Max Horn
c0805830eb Fix various typenames to comply to the ScummVM coding guidelines
svn-id: r22928
2006-06-05 12:22:51 +00:00
Max Horn
76116f36dd *Loads* of Common::String related optimizations. Woa, *tons* of methods were copying strings needlessly
svn-id: r22873
2006-06-03 13:33:39 +00:00
Johannes Schickel
1d72b954c7 Introduces special switch for GraphicsWidget for use of theme transparency again.
svn-id: r22746
2006-05-29 14:55:43 +00:00
Johannes Schickel
0a557cf2a4 - changes transparency parameter of Theme::drawSurface to alpha parameter.
- adds possibility to draw GraphicsWidgets with alpha values.

svn-id: r22738
2006-05-29 14:00:00 +00:00
Johannes Schickel
af25e65c31 Removes leftover comment.
svn-id: r22737
2006-05-29 13:24:49 +00:00
Johannes Schickel
f3e74f88de - Fixes disabled transparency for classic theme.
- Introduces check for define 'CT_NO_TRANSPARENCY' to disable transparency support.

svn-id: r22735
2006-05-29 13:12:04 +00:00
Eugene Sandulenko
b56c7b88d7 Major GUI update:
- Implemented padding in console
- Update only current line in console instead of whole screen
- Fixed caret positioning in edit text widget
- Improved buttons drawing, now they look more realistic
- Added label spacing in popup widget
- Correct shadow in popup widget
- Fixed up with selected popup widget being drawn on wrong tab
- Added shading to list dialog
- Adjusted shading of inactive widgets
- Proper coloring of browset (add game) dialog
- Introduced Container widget
- Used Container widget in scumm save/load dialog. Now it looks properly
- Adjusted button colors even more. Now they match almost perfectly albeit with banding
- Made scrollbar appear only when it is really needed

svn-id: r22670
2006-05-27 05:46:04 +00:00
Eugene Sandulenko
7f8b79d5d0 Use Courier 12pt (free one) for 2x and 3x console. Looks much more useable now.
svn-id: r22644
2006-05-26 01:05:19 +00:00
Eugene Sandulenko
fac7a13cf5 Proper rendering of slider widget.
svn-id: r22527
2006-05-18 21:48:47 +00:00
Eugene Sandulenko
4ead8dff26 - Fix spelling in theme config
- Introduce embossing shadow
- Less round corners in popup widget
- Custom border in editable text widget
- Matched color in popup widget and editable text widget with mock-ups
- Less round corners in editable text widget
- Text padding in editable text widget

svn-id: r22525
2006-05-18 20:53:28 +00:00
Eugene Sandulenko
71e341ba39 Better cursor image
svn-id: r22507
2006-05-18 01:36:06 +00:00
Johannes Schickel
6b225b40fa Uses the special cursor color palette for the cursor now (this fixes problems with creation of thumbnails of the scumm engine)
svn-id: r22152
2006-04-25 15:20:46 +00:00
Eugene Sandulenko
58462fa682 - minor cleanup in modern.ini
- implement skipFor theme section keyword

svn-id: r22151
2006-04-25 14:59:42 +00:00
Johannes Schickel
9e734b0851 Adds handleScreenChanged() to NewGui, so (scumm) engine can call it when it recives a EVENT_SCREEN_CHANGED.
svn-id: r22025
2006-04-19 06:22:15 +00:00
Johannes Schickel
1c65f3417a Fixes problems with wrong colors on the overlay in scumm engine.
svn-id: r22024
2006-04-19 06:00:34 +00:00
Johannes Schickel
0a767b6467 Implements custom cursor support for the new theme and includes a standard cursor (it should be replaced though).
svn-id: r22019
2006-04-19 03:17:00 +00:00
Johannes Schickel
1ae205a241 - adds own drawing function for (not expanded) popup widgets
- adds pixmaps, colorfades, and gradient factor for the (not expanded) popup widget in new theme
- bumps themeconfig version

svn-id: r22011
2006-04-18 18:40:33 +00:00
Johannes Schickel
e9cbf5fcbd - Moves Graphics::loadFont to Graphics::NewFont::loadFont
- adds code for caching of fonts (just for Graphics::NewFont)
- implements cache using in the modern theme for custom fonts
- adds cache file for current normal font in the theme zip file

svn-id: r21952
2006-04-16 19:54:39 +00:00
Johannes Schickel
96cf7028b9 - implements .bdf font loader based on convbdf (sure could have some clean up)
- adds three different font styles to the themes (normal, bold (default one), italic)
- implements code for specifing the font files in the theme config ('fontfile_normal','fontfile_bold' and 'fontfile_italic' in the 'extra' section)
- changes EditTextWidget to use the normal font (has some minor aligment problems with the caret now, though)
- extends the FontManager (new functions: getFontByName, assignFontToName, removeFontName)
- adds the font style constans to the builtin constants for the evaluator)

svn-id: r21868
2006-04-14 02:16:55 +00:00
Johannes Schickel
1444a1ab9f - No longer draws full shadows for disabled widgets
- Implements 'negativ alpha' values for drawSurfaceMasked (from -1 to -100, used to dim the pixels -1 means very very small dim -100 should be black)
- Changes drawSurfaceMasked to use macros for easy changing drawing code

svn-id: r21852
2006-04-13 22:47:22 +00:00
Johannes Schickel
f2370a0560 Deletes color cache and custom dialog shading.
svn-id: r21850
2006-04-13 22:20:50 +00:00
Johannes Schickel
521697be01 Fixes disappearing borders with classic theme.
svn-id: r21795
2006-04-11 16:28:00 +00:00
Johannes Schickel
12374accc3 Makes classic theme compile without OLDGUI_TRANSPARENCY again.
svn-id: r21790
2006-04-11 14:16:15 +00:00
Johannes Schickel
a06a28fa97 Implements saving the color cache to a file (much faster startup for custom effect + less memory while gui isn't shown)
svn-id: r21766
2006-04-10 17:32:04 +00:00
Johannes Schickel
d0b8efd575 - moves some code in ThemeNew.cpp (calcGradient and calcAlpha to the bottom)
- added possibility to use a shading effect on inactive dialogs (luminance and dim are builtin, and special ablility to specifiy a own expression, evaluated via the evaluator)
- adds also a color cache (atm it's generated on startup)
- uses luminance effect by default
- bumps theme config version to 7

svn-id: r21544
2006-04-02 00:56:21 +00:00
Max Horn
08ad918af6 Reduce (indirect) dependencies on gui/eval.h (and thus common/assocarray.h) to a minimum
svn-id: r21426
2006-03-24 14:15:45 +00:00
Eugene Sandulenko
c9970b78b5 Rearrange launcher.
Logo is still shown weirdly.

svn-id: r21268
2006-03-14 02:19:38 +00:00
Lars Persson
96e87cdfe7 Moved typedef Common::String into class declaration.
svn-id: r21187
2006-03-09 22:40:21 +00:00
Eugene Sandulenko
a8a8624511 o Converted most (all?) widgets to new scheme.
o Converted global options dialog to new scheme.

svn-id: r21137
2006-03-08 01:42:02 +00:00
Eugene Sandulenko
fc84c7fc1d o More widgets fot alternative constructors
o Cleanup of launcher dialog
o Implemented useWithPrefix keyword

svn-id: r21131
2006-03-07 19:02:42 +00:00