aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
Diffstat (limited to 'gui')
-rw-r--r--gui/InterfaceManager.cpp51
-rw-r--r--gui/InterfaceManager.h7
-rw-r--r--gui/ThemeDefaultXML.cpp57
-rw-r--r--gui/ThemeParser.cpp12
-rw-r--r--gui/ThemeParser.h2
-rw-r--r--gui/module.mk1
6 files changed, 89 insertions, 41 deletions
diff --git a/gui/InterfaceManager.cpp b/gui/InterfaceManager.cpp
index 0afb71bfd5..ac04e56bc0 100644
--- a/gui/InterfaceManager.cpp
+++ b/gui/InterfaceManager.cpp
@@ -132,10 +132,12 @@ bool InterfaceManager::addDrawData(DrawData data_id, bool cached) {
return true;
}
-bool InterfaceManager::loadTheme(Common::String &themeName) {
+bool InterfaceManager::loadTheme(Common::String themeName) {
if (!loadThemeXML(themeName)) {
- warning("Could not parse custom theme '%s'.", themeName.c_str());
- return false;
+ warning("Could not parse custom theme '%s'.\nFalling back to default theme", themeName.c_str());
+
+ if (!loadDefaultXML()) // if we can't load the embeded theme, this is a complete failure
+ error("Could not load default embeded theme.");
}
for (int i = 0; i < kDrawDataMAX; ++i) {
@@ -153,7 +155,7 @@ bool InterfaceManager::loadTheme(Common::String &themeName) {
return true;
}
-bool InterfaceManager::loadThemeXML(Common::String &themeName) {
+bool InterfaceManager::loadThemeXML(Common::String themeName) {
assert(_parser);
if (ConfMan.hasKey("themepath"))
@@ -254,57 +256,28 @@ void InterfaceManager::drawScrollbar(const Common::Rect &r, int sliderY, int sli
int InterfaceManager::runGUI() {
Common::EventManager *eventMan = _system->getEventManager();
+
+ loadTheme("modern_theme.xml");
+
_system->showOverlay();
- Graphics::DrawStep *steps = new Graphics::DrawStep[5];
+ Graphics::DrawStep *steps = new Graphics::DrawStep[2];
steps[0].gradColor1.r = 214;
steps[0].gradColor1.g = 113;
steps[0].gradColor1.b = 8;
+ steps[0].gradColor1.set = true;
steps[0].gradColor2.r = 240;
steps[0].gradColor2.g = 200;
steps[0].gradColor2.b = 25;
+ steps[0].gradColor2.set = true;
steps[0].fillMode = VectorRenderer::kFillGradient;
steps[0].drawingCall = &VectorRenderer::drawCallback_FILLSURFACE;
- steps[1].gradColor1.r = 206;
- steps[1].gradColor1.g = 121;
- steps[1].gradColor1.b = 99;
- steps[1].gradColor2.r = 173;
- steps[1].gradColor2.g = 40;
- steps[1].gradColor2.b = 8;
- steps[1].radius = 8; // radius
- steps[1].fillArea = true;
- steps[1].drawingCall = &VectorRenderer::drawCallback_ROUNDSQ;
- steps[1].scale = (1 << 16);
-
- steps[2].radius = 8; // radius
- steps[2].fillArea = false;
- steps[2].x.relative = true;
- steps[2].x.pos = 32;
- steps[2].y.relative = false;
- steps[2].y.pos = 32;
- steps[2].w = 128;
- steps[2].h = 32;
- steps[2].drawingCall = &VectorRenderer::drawCallback_ROUNDSQ;
- steps[2].scale = (1 << 16);
-
- steps[3].fgColor.r = 255;
- steps[3].fgColor.g = 255;
- steps[3].fgColor.b = 255;
- steps[3].drawingCall = &VectorRenderer::drawCallback_VOID;
-
- Common::Rect area = Common::Rect(32, 32, 256, 256);
-
bool running = true;
while (running) { // draw!!
_vectorRenderer->drawStep(Common::Rect(), steps[0]);
- _vectorRenderer->drawStep(Common::Rect(), steps[3]);
- _vectorRenderer->drawStep(area, steps[1]);
- _vectorRenderer->drawStep(area, steps[2]);
-// _vectorRenderer->drawStep(Common::Rect(32, 32, 256, 256), &steps[3]);
-
_vectorRenderer->copyFrame(_system);
Common::Event event;
diff --git a/gui/InterfaceManager.h b/gui/InterfaceManager.h
index 97af6732e0..906c5173e1 100644
--- a/gui/InterfaceManager.h
+++ b/gui/InterfaceManager.h
@@ -190,12 +190,13 @@ public:
return _initOk && _themeOk;
}
- bool loadTheme(Common::String &themeName);
+ bool loadTheme(Common::String themeName);
protected:
template<typename PixelType> void screenInit();
- bool loadThemeXML(Common::String &themeName);
+ bool loadThemeXML(Common::String themeName);
+ bool loadDefaultXML();
void freeRenderer() {
delete _vectorRenderer;
@@ -232,6 +233,8 @@ protected:
bool _initOk;
bool _themeOk;
bool _caching;
+
+ static const char *_defaultXML;
};
struct WidgetDrawData {
diff --git a/gui/ThemeDefaultXML.cpp b/gui/ThemeDefaultXML.cpp
new file mode 100644
index 0000000000..406e05badf
--- /dev/null
+++ b/gui/ThemeDefaultXML.cpp
@@ -0,0 +1,57 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "common/system.h"
+#include "gui/InterfaceManager.h"
+
+namespace GUI {
+
+bool InterfaceManager::loadDefaultXML() {
+ const char *defaultXML =
+/**
+ * Default theme description file. Work in progress.
+ * Newlines are not necessary, parser ignores them.
+ * You may use single quotes (') instead of scaped double quotes.
+ * Remember to indent properly the XML so it's easier to read and
+ * to maintain!
+ */
+"<render_info>"
+ "<palette>"
+ "<color name = 'red' rgb = '255, 0, 0' />"
+ "<color name = 'green' rgb = '0, 255, 0' />"
+ "<color name = 'blue' rgb = '0, 0, 255' />"
+ "</palette>"
+ "<drawdata id = 'mainmenu_bg' cache = false>"
+ "<drawstep func = 'roundedsq' radius = 8 fill = 'none' color = '0, 1, 2' size = 'auto' />"
+ "</drawdata>"
+"</render_info>";
+
+ if (!parser()->loadBuffer(defaultXML, true))
+ return false;
+
+ return parser()->parse();
+}
+
+}
diff --git a/gui/ThemeParser.cpp b/gui/ThemeParser.cpp
index 6e60d8a499..5c0d1cbbdc 100644
--- a/gui/ThemeParser.cpp
+++ b/gui/ThemeParser.cpp
@@ -45,6 +45,7 @@ ThemeParser::ThemeParser() : XMLParser() {
_callbacks["palette"] = &ThemeParser::parserCallback_palette;
_callbacks["color"] = &ThemeParser::parserCallback_color;
_callbacks["render_info"] = &ThemeParser::parserCallback_renderInfo;
+ _callbacks["layout_info"] = &ThemeParser::parserCallback_layoutInfo;
_drawFunctions["circle"] = &Graphics::VectorRenderer::drawCallback_CIRCLE;
_drawFunctions["square"] = &Graphics::VectorRenderer::drawCallback_SQUARE;
@@ -97,6 +98,17 @@ bool ThemeParser::parserCallback_renderInfo() {
return true;
}
+bool ThemeParser::parserCallback_layoutInfo() {
+ ParserNode *layoutNode = getActiveNode();
+
+ assert(layoutNode->name == "layout_info");
+
+ if (getParentNode(layoutNode) != 0)
+ return parserError("<layout_info> keys must be root elements.");
+
+ return true;
+}
+
bool ThemeParser::parserCallback_palette() {
ParserNode *paletteNode = getActiveNode();
diff --git a/gui/ThemeParser.h b/gui/ThemeParser.h
index c012e4fb45..95d9135e12 100644
--- a/gui/ThemeParser.h
+++ b/gui/ThemeParser.h
@@ -323,6 +323,8 @@ protected:
bool parserCallback_palette();
bool parserCallback_color();
bool parserCallback_renderInfo();
+ bool parserCallback_layoutInfo();
+
bool validateKeyIntSigned(const char *key) {
if (!isdigit(*key) && *key != '+' && *key != '-')
diff --git a/gui/module.mk b/gui/module.mk
index eecf9a093d..81be839777 100644
--- a/gui/module.mk
+++ b/gui/module.mk
@@ -25,6 +25,7 @@ MODULE_OBJS := \
widget.o \
theme.o \
ThemeClassic.o \
+ ThemeDefaultXML.o \
ThemeModern.o \
ThemeParser.o \
theme-config.o
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-02 20:17:59 +0000