diff options
author | stevenhoefel | 2017-01-11 11:25:31 +1100 |
---|---|---|
committer | stevenhoefel | 2017-01-11 11:25:31 +1100 |
commit | 12032bb51860c203b817334648452a08f635d118 (patch) | |
tree | ba9ee8ebadd048955aeb1feff84b325f415cc1e3 /graphics/macgui/macwindowmanager.cpp | |
parent | 3f491601f3a53242c08d31ec7be3e0d109b422a0 (diff) | |
download | scummvm-rg350-12032bb51860c203b817334648452a08f635d118.tar.gz scummvm-rg350-12032bb51860c203b817334648452a08f635d118.tar.bz2 scummvm-rg350-12032bb51860c203b817334648452a08f635d118.zip |
DIRECTOR: Round rectangles for Buttons. Improved TextCast alignment.
Diffstat (limited to 'graphics/macgui/macwindowmanager.cpp')
-rw-r--r-- | graphics/macgui/macwindowmanager.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp index bad4ad3acc..ebc2a8f76d 100644 --- a/graphics/macgui/macwindowmanager.cpp +++ b/graphics/macgui/macwindowmanager.cpp @@ -217,18 +217,8 @@ void MacWindowManager::removeWindow(MacWindow *target) { _needsRemoval = true; } -struct PlotData { - Graphics::ManagedSurface *surface; - MacPatterns *patterns; - uint fillType; - int thickness; - - PlotData(Graphics::ManagedSurface *s, MacPatterns *p, int f, int t) : - surface(s), patterns(p), fillType(f), thickness(t) {} -}; - -static void drawPixel(int x, int y, int color, void *data) { - PlotData *p = (PlotData *)data; +void macDrawPixel(int x, int y, int color, void *data) { + MacPlotData *p = (MacPlotData *)data; if (p->fillType > p->patterns->size()) return; @@ -265,9 +255,9 @@ static void drawPixel(int x, int y, int color, void *data) { void MacWindowManager::drawDesktop() { Common::Rect r(_screen->getBounds()); - PlotData pd(_screen, &_patterns, kPatternCheckers, 1); + MacPlotData pd(_screen, &_patterns, kPatternCheckers, 1); - Graphics::drawRoundRect(r, kDesktopArc, kColorBlack, true, drawPixel, &pd); + Graphics::drawRoundRect(r, kDesktopArc, kColorBlack, true, macDrawPixel, &pd); g_system->copyRectToScreen(_screen->getPixels(), _screen->pitch, 0, 0, _screen->w, _screen->h); } |