libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-05 10:26:40 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

WAGE: Extract MacWindow

Browse Source
This commit is contained in:
Borja Lorente 2016-07-29 11:45:52 +02:00
parent 592a6defb7
commit 744034bd98
10 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/wage/gui-console.cpp
View File

@ -51,11 +51,11 @@
#include "graphics/cursorman.h" #include "graphics/cursorman.h"
#include "graphics/fonts/bdf.h" #include "graphics/fonts/bdf.h"
#include "graphics/palette.h" #include "graphics/palette.h"
#include "graphics/macgui/macwindow.h"
#include "wage/wage.h" #include "wage/wage.h"
#include "wage/design.h" #include "wage/design.h"
#include "wage/entities.h" #include "wage/entities.h"
#include "wage/macwindow.h"
#include "wage/macmenu.h" #include "wage/macmenu.h"
#include "wage/gui.h" #include "wage/gui.h"
#include "wage/world.h" #include "wage/world.h"

2
engines/wage/gui.cpp
View File

@ -50,12 +50,12 @@
#include "graphics/cursorman.h" #include "graphics/cursorman.h"
#include "graphics/primitives.h" #include "graphics/primitives.h"
#include "graphics/macgui/macwindowmanager.h" #include "graphics/macgui/macwindowmanager.h"
#include "graphics/macgui/macwindow.h"
#include "wage/wage.h" #include "wage/wage.h"
#include "wage/design.h" #include "wage/design.h"
#include "wage/entities.h" #include "wage/entities.h"
#include "wage/gui.h" #include "wage/gui.h"
#include "wage/macwindow.h"
#include "wage/macmenu.h" #include "wage/macmenu.h"
#include "wage/world.h" #include "wage/world.h"

3
engines/wage/gui.h
View File

@ -52,12 +52,11 @@
#include "graphics/font.h" #include "graphics/font.h"
#include "graphics/managed_surface.h" #include "graphics/managed_surface.h"
#include "graphics/macgui/macwindowmanager.h" #include "graphics/macgui/macwindowmanager.h"
#include "graphics/macgui/macwindow.h"
#include "common/events.h" #include "common/events.h"
#include "common/rect.h" #include "common/rect.h"
#include "wage/macwindow.h"
namespace Wage { namespace Wage {
class Menu; class Menu;

2
engines/wage/macmenu.cpp
View File

@ -51,8 +51,8 @@
#include "graphics/primitives.h" #include "graphics/primitives.h"
#include "graphics/font.h" #include "graphics/font.h"
#include "graphics/macgui/macwindowmanager.h" #include "graphics/macgui/macwindowmanager.h"
#include "graphics/macgui/macwindow.h"
#include "wage/macwindow.h"
#include "wage/macmenu.h" #include "wage/macmenu.h"
namespace Wage { namespace Wage {

1
engines/wage/module.mk
View File

@ -10,7 +10,6 @@ MODULE_OBJS := \
gui.o \ gui.o \
gui-console.o \ gui-console.o \
macmenu.o \ macmenu.o \
macwindow.o \
randomhat.o \ randomhat.o \
saveload.o \ saveload.o \
script.o \ script.o \

9
engines/wage/macwindow.cpp → graphics/macgui/macwindow.cpp
View File

@ -49,8 +49,7 @@
#include "graphics/primitives.h" #include "graphics/primitives.h"
#include "common/events.h" #include "common/events.h"
#include "graphics/macgui/macwindowmanager.h" #include "graphics/macgui/macwindowmanager.h"
#include "graphics/macgui/macwindow.h"
#include "wage/macwindow.h"
namespace Graphics { namespace Graphics {
@ -264,16 +263,16 @@ void MacWindow::setHighlight(WindowClick highlightedPart) {
_highlightedPart = highlightedPart; _highlightedPart = highlightedPart;
_borderIsDirty = true; _borderIsDirty = true;
} }
void MacWindow::setScroll(float scrollPos, float scrollSize) { void MacWindow::setScroll(float scrollPos, float scrollSize) {
if (_scrollPos == scrollPos && _scrollSize == scrollSize) if (_scrollPos == scrollPos && _scrollSize == scrollSize)
return; return;
_scrollPos = scrollPos; _scrollPos = scrollPos;
_scrollSize = scrollSize; _scrollSize = scrollSize;
_borderIsDirty = true; _borderIsDirty = true;
} }
void MacWindow::drawBox(ManagedSurface *g, int x, int y, int w, int h) { void MacWindow::drawBox(ManagedSurface *g, int x, int y, int w, int h) {

0
engines/wage/macwindow.h → graphics/macgui/macwindow.h
View File

2
graphics/macgui/macwindowmanager.cpp
View File

@ -58,8 +58,8 @@
#include "graphics/palette.h" #include "graphics/palette.h"
#include "graphics/primitives.h" #include "graphics/primitives.h"
#include "graphics/macgui/macwindowmanager.h" #include "graphics/macgui/macwindowmanager.h"
#include "graphics/macgui/macwindow.h"
#include "wage/macwindow.h"
#include "wage/macmenu.h" #include "wage/macmenu.h"
namespace Graphics { namespace Graphics {

3
graphics/macgui/macwindowmanager.h
View File

@ -54,8 +54,7 @@
#include "common/archive.h" #include "common/archive.h"
#include "graphics/fontman.h" #include "graphics/fontman.h"
#include "graphics/macgui/macwindow.h"
#include "engines/wage/macwindow.h"
namespace Wage { namespace Wage {
class MacWindow; class MacWindow;

3
graphics/module.mk
View File

@ -29,7 +29,8 @@ MODULE_OBJS := \
VectorRendererSpec.o \ VectorRendererSpec.o \
wincursor.o \ wincursor.o \
yuv_to_rgb.o \ yuv_to_rgb.o \
macgui/macwindowmanager.o macgui/macwindowmanager.o\
macgui/macwindow.o
ifdef USE_SCALERS ifdef USE_SCALERS
MODULE_OBJS += \ MODULE_OBJS += \