diff options
| author | Eugene Sandulenko | 2006-05-18 01:36:06 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2006-05-18 01:36:06 +0000 |
| commit | 71e341ba39758379a80fe47a2e9e61ce85e7605d (patch) | |
| tree | c3f26dfb500d1816c7b6ac704e0deae60b9346a0 | |
| parent | 9103ddda4e5b70f106ea0a0e56d59c90fc7bbcb8 (diff) | |
| download | scummvm-rg350-71e341ba39758379a80fe47a2e9e61ce85e7605d.tar.gz scummvm-rg350-71e341ba39758379a80fe47a2e9e61ce85e7605d.tar.bz2 scummvm-rg350-71e341ba39758379a80fe47a2e9e61ce85e7605d.zip | |
Better cursor image
svn-id: r22507
| -rw-r--r-- | gui/ThemeNew.cpp | 9 | ||||
| -rw-r--r-- | gui/theme.h | 1 | ||||
| -rw-r--r-- | gui/themes/modern.ini | 3 | ||||
| -rw-r--r-- | gui/themes/modern.zip | bin | 34898 -> 34991 bytes |
4 files changed, 9 insertions, 4 deletions
diff --git a/gui/ThemeNew.cpp b/gui/ThemeNew.cpp index 27fe15a673..98287312e8 100644 --- a/gui/ThemeNew.cpp +++ b/gui/ThemeNew.cpp @@ -38,7 +38,7 @@ #define kShadowTr3 64 #define kShadowTr4 128 -#define THEME_VERSION 10 +#define THEME_VERSION 11 using Graphics::Surface; @@ -248,6 +248,8 @@ _lastUsedBitMask(0), _forceRedraw(false), _fonts(), _imageHandles(0), _images(0) getExtraValueFromConfig(_configFile, "cursor_hotspot_x", _cursorHotspotX, 0); getExtraValueFromConfig(_configFile, "cursor_hotspot_y", _cursorHotspotY, 0); + + getExtraValueFromConfig(_configFile, "cursor_targetScale", _cursorTargetScale, 1); // inactive dialog shading stuff _dialogShadingCallback = 0; @@ -300,7 +302,7 @@ _lastUsedBitMask(0), _forceRedraw(false), _fonts(), _imageHandles(0), _images(0) _lastUsedBitMask = gBitFormat; - // creats the cursor image + // creates cursor image if (_system->hasFeature(OSystem::kFeatureCursorHasPalette)) { createCursor(); } @@ -334,6 +336,7 @@ bool ThemeNew::init() { _initOk = true; clearAll(); setupFonts(); + setUpCursor(); resetDrawArea(); } @@ -1506,7 +1509,7 @@ OverlayColor ThemeNew::calcDimColor(OverlayColor col) { void ThemeNew::setUpCursor() { _system->setCursorPalette(_cursorPal, 0, MAX_CURS_COLORS); - _system->setMouseCursor(_cursor, _cursorWidth, _cursorHeight, _cursorHotspotX, _cursorHotspotY); + _system->setMouseCursor(_cursor, _cursorWidth, _cursorHeight, _cursorHotspotX, _cursorHotspotY, 255, _cursorTargetScale); _system->disableCursorPalette(false); } diff --git a/gui/theme.h b/gui/theme.h index cfbf4f95c1..557010f1a4 100644 --- a/gui/theme.h +++ b/gui/theme.h @@ -454,6 +454,7 @@ private: void setUpCursor(); void createCursor(); int _cursorHotspotX, _cursorHotspotY; + int _cursorTargetScale; #define MAX_CURS_COLORS 255 byte *_cursor; bool _needPaletteUpdates; diff --git a/gui/themes/modern.ini b/gui/themes/modern.ini index 6c6e5d51b4..a4b6cfe5c4 100644 --- a/gui/themes/modern.ini +++ b/gui/themes/modern.ini @@ -1,7 +1,7 @@ # $URL$ # $Id$ [theme] -version=10 +version=11 [pixmaps] dialog_corner=dialog_bkgd_corner.bmp @@ -150,6 +150,7 @@ shading_dim_percent=30 fontfile_normal=helvr12-l1.bdf cursor_hotspot_x=0 cursor_hotspot_y=0 +cursor_targetScale=3 [XxY] skipFor=320xY diff --git a/gui/themes/modern.zip b/gui/themes/modern.zip Binary files differindex bfc40abca4..cfdbce163a 100644 --- a/gui/themes/modern.zip +++ b/gui/themes/modern.zip |