Index: ps/trunk/build/premake/premake5.lua
===================================================================
--- ps/trunk/build/premake/premake5.lua
+++ ps/trunk/build/premake/premake5.lua
@@ -759,7 +759,10 @@
source_dirs = {
"gui",
- "gui/scripting",
+ "gui/ObjectTypes",
+ "gui/ObjectBases",
+ "gui/Scripting",
+ "gui/SettingTypes",
"i18n"
}
extern_libs = {
Index: ps/trunk/source/gui/CButton.h
===================================================================
--- ps/trunk/source/gui/CButton.h
+++ ps/trunk/source/gui/CButton.h
@@ -1,89 +0,0 @@
-/* Copyright (C) 2019 Wildfire Games.
- * This file is part of 0 A.D.
- *
- * 0 A.D. 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.
- *
- * 0 A.D. 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 0 A.D. If not, see .
- */
-
-#ifndef INCLUDED_CBUTTON
-#define INCLUDED_CBUTTON
-
-#include "gui/IGUIButtonBehavior.h"
-#include "gui/IGUIObject.h"
-#include "gui/IGUITextOwner.h"
-#include "gui/CGUISprite.h"
-#include "gui/CGUIString.h"
-
-class CButton : public IGUIObject, public IGUITextOwner, public IGUIButtonBehavior
-{
- GUI_OBJECT(CButton)
-
-public:
- CButton(CGUI& pGUI);
- virtual ~CButton();
-
- /**
- * @see IGUIObject#ResetStates()
- */
- virtual void ResetStates();
-
- /**
- * @see IGUIObject#UpdateCachedSize()
- */
- virtual void UpdateCachedSize();
-
- /**
- * @see IGUIObject#HandleMessage()
- */
- virtual void HandleMessage(SGUIMessage& Message);
-
- /**
- * Draws the Button
- */
- virtual void Draw();
-
-protected:
- /**
- * Sets up text, should be called every time changes has been
- * made that can change the visual.
- */
- void SetupText();
-
- /**
- * Picks the text color depending on current object settings.
- */
- const CGUIColor& ChooseColor();
-
- /**
- * Placement of text.
- */
- CPos m_TextPos;
-
- // Settings
- float m_BufferZone;
- i32 m_CellID;
- CGUIString m_Caption;
- CStrW m_Font;
- CGUISpriteInstance m_Sprite;
- CGUISpriteInstance m_SpriteOver;
- CGUISpriteInstance m_SpritePressed;
- CGUISpriteInstance m_SpriteDisabled;
- EAlign m_TextAlign;
- EVAlign m_TextVAlign;
- CGUIColor m_TextColor;
- CGUIColor m_TextColorOver;
- CGUIColor m_TextColorPressed;
- CGUIColor m_TextColorDisabled;
-};
-
-#endif // INCLUDED_CBUTTON
Index: ps/trunk/source/gui/CButton.cpp
===================================================================
--- ps/trunk/source/gui/CButton.cpp
+++ ps/trunk/source/gui/CButton.cpp
@@ -1,119 +0,0 @@
-/* Copyright (C) 2019 Wildfire Games.
- * This file is part of 0 A.D.
- *
- * 0 A.D. 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.
- *
- * 0 A.D. 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 0 A.D. If not, see .
- */
-
-#include "precompiled.h"
-
-#include "CButton.h"
-
-#include "gui/CGUI.h"
-#include "gui/CGUIColor.h"
-#include "gui/CGUIText.h"
-
-CButton::CButton(CGUI& pGUI)
- : IGUIObject(pGUI),
- IGUIButtonBehavior(*static_cast(this)),
- IGUITextOwner(*static_cast(this)),
- m_BufferZone(),
- m_CellID(),
- m_Caption(),
- m_Font(),
- m_Sprite(),
- m_SpriteOver(),
- m_SpritePressed(),
- m_SpriteDisabled(),
- m_TextAlign(),
- m_TextVAlign(),
- m_TextColor(),
- m_TextColorOver(),
- m_TextColorPressed(),
- m_TextColorDisabled()
-{
- RegisterSetting("buffer_zone", m_BufferZone);
- RegisterSetting("cell_id", m_CellID);
- RegisterSetting("caption", m_Caption);
- RegisterSetting("font", m_Font);
- RegisterSetting("sprite", m_Sprite);
- RegisterSetting("sprite_over", m_SpriteOver);
- RegisterSetting("sprite_pressed", m_SpritePressed);
- RegisterSetting("sprite_disabled", m_SpriteDisabled);
- RegisterSetting("text_align", m_TextAlign);
- RegisterSetting("text_valign", m_TextVAlign);
- RegisterSetting("textcolor", m_TextColor);
- RegisterSetting("textcolor_over", m_TextColorOver);
- RegisterSetting("textcolor_pressed", m_TextColorPressed);
- RegisterSetting("textcolor_disabled", m_TextColorDisabled);
-
- AddText();
-}
-
-CButton::~CButton()
-{
-}
-
-void CButton::SetupText()
-{
- ENSURE(m_GeneratedTexts.size() == 1);
-
- m_GeneratedTexts[0] = CGUIText(m_pGUI, m_Caption, m_Font, m_CachedActualSize.GetWidth(), m_BufferZone, this);
- CalculateTextPosition(m_CachedActualSize, m_TextPos, m_GeneratedTexts[0]);
-}
-
-void CButton::ResetStates()
-{
- IGUIObject::ResetStates();
- IGUIButtonBehavior::ResetStates();
-}
-
-void CButton::UpdateCachedSize()
-{
- IGUIObject::UpdateCachedSize();
- IGUITextOwner::UpdateCachedSize();
-}
-
-void CButton::HandleMessage(SGUIMessage& Message)
-{
- IGUIObject::HandleMessage(Message);
- IGUIButtonBehavior::HandleMessage(Message);
- IGUITextOwner::HandleMessage(Message);
-}
-
-void CButton::Draw()
-{
- const float bz = GetBufferedZ();
-
- m_pGUI.DrawSprite(
- GetButtonSprite(m_Sprite, m_SpriteOver, m_SpritePressed, m_SpriteDisabled),
- m_CellID,
- bz,
- m_CachedActualSize);
-
- DrawText(0, ChooseColor(), m_TextPos, bz + 0.1f);
-}
-
-const CGUIColor& CButton::ChooseColor()
-{
- if (!m_Enabled)
- return m_TextColorDisabled || m_TextColor;
-
- if (!m_MouseHovering)
- return m_TextColor;
-
- if (m_Pressed)
- return m_TextColorPressed || m_TextColor;
-
- return m_TextColorOver || m_TextColor;
-}
Index: ps/trunk/source/gui/CChart.h
===================================================================
--- ps/trunk/source/gui/CChart.h
+++ ps/trunk/source/gui/CChart.h
@@ -1,111 +0,0 @@
-/* Copyright (C) 2019 Wildfire Games.
- * This file is part of 0 A.D.
- *
- * 0 A.D. 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.
- *
- * 0 A.D. 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 0 A.D. If not, see .
- */
-
-#ifndef INCLUDED_CCHART
-#define INCLUDED_CCHART
-
-#include "graphics/ShaderProgramPtr.h"
-#include "gui/CGUIColor.h"
-#include "gui/CGUIList.h"
-#include "gui/CGUISeries.h"
-#include "gui/IGUITextOwner.h"
-#include "maths/Vector2D.h"
-
-#include
-
-struct CChartData
-{
- // Avoid copying the container.
- NONCOPYABLE(CChartData);
- MOVABLE(CChartData);
- CChartData() = default;
-
- CGUIColor m_Color;
- std::vector m_Points;
-};
-
-/**
- * Chart for a data visualization as lines or points
- */
-class CChart : public IGUIObject, public IGUITextOwner
-{
- GUI_OBJECT(CChart)
-
-public:
- CChart(CGUI& pGUI);
- virtual ~CChart();
-
-protected:
- /**
- * @see IGUIObject#UpdateCachedSize()
- */
- void UpdateCachedSize();
-
- /**
- * @see IGUIObject#HandleMessage()
- */
- virtual void HandleMessage(SGUIMessage& Message);
-
- /**
- * Draws the Chart
- */
- virtual void Draw();
-
- virtual CRect GetChartRect() const;
-
- void UpdateSeries();
-
- void SetupText();
-
- std::vector m_Series;
-
- CVector2D m_LeftBottom, m_RightTop;
-
- std::vector m_TextPositions;
-
- bool m_EqualX, m_EqualY;
-
- // Settings
- CGUIColor m_AxisColor;
- float m_AxisWidth;
- float m_BufferZone;
- CStrW m_Font;
- CStrW m_FormatX;
- CStrW m_FormatY;
- CGUIList m_SeriesColor;
- CGUISeries m_SeriesSetting;
- EAlign m_TextAlign;
-
-private:
- /**
- * Helper functions
- */
- void DrawLine(const CShaderProgramPtr& shader, const CGUIColor& color, const std::vector& vertices) const;
-
- // Draws the triangle sequence so that the each next triangle has a common edge with the previous one.
- // If we need to draw n triangles, we need only n + 2 points.
- void DrawTriangleStrip(const CShaderProgramPtr& shader, const CGUIColor& color, const std::vector& vertices) const;
-
- // Represents axes as triangles and draws them with DrawTriangleStrip.
- void DrawAxes(const CShaderProgramPtr& shader) const;
-
- CSize AddFormattedValue(const CStrW& format, const float value, const CStrW& font, const float buffer_zone);
-
- void UpdateBounds();
-};
-
-#endif // INCLUDED_CCHART
Index: ps/trunk/source/gui/CChart.cpp
===================================================================
--- ps/trunk/source/gui/CChart.cpp
+++ ps/trunk/source/gui/CChart.cpp
@@ -1,318 +0,0 @@
-/* Copyright (C) 2019 Wildfire Games.
- * This file is part of 0 A.D.
- *
- * 0 A.D. 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.
- *
- * 0 A.D. 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 0 A.D. If not, see .
- */
-
-#include "precompiled.h"
-
-#include "CChart.h"
-
-#include "graphics/ShaderManager.h"
-#include "gui/CGUIList.h"
-#include "gui/CGUISeries.h"
-#include "gui/CGUIString.h"
-#include "gui/GUIMatrix.h"
-#include "ps/CLogger.h"
-#include "ps/Profile.h"
-#include "renderer/Renderer.h"
-
-#include
-
-CChart::CChart(CGUI& pGUI)
- : IGUIObject(pGUI),
- IGUITextOwner(*static_cast(this)),
- m_AxisColor(),
- m_AxisWidth(),
- m_BufferZone(),
- m_Font(),
- m_FormatX(),
- m_FormatY(),
- m_SeriesColor(),
- m_SeriesSetting(),
- m_TextAlign()
-{
- RegisterSetting("axis_color", m_AxisColor);
- RegisterSetting("axis_width", m_AxisWidth);
- RegisterSetting("buffer_zone", m_BufferZone);
- RegisterSetting("font", m_Font);
- RegisterSetting("format_x", m_FormatX);
- RegisterSetting("format_y", m_FormatY);
- RegisterSetting("series_color", m_SeriesColor);
- RegisterSetting("series", m_SeriesSetting);
- RegisterSetting("text_align", m_TextAlign);
-}
-
-CChart::~CChart()
-{
-}
-
-void CChart::UpdateCachedSize()
-{
- IGUIObject::UpdateCachedSize();
- IGUITextOwner::UpdateCachedSize();
-}
-
-void CChart::HandleMessage(SGUIMessage& Message)
-{
- IGUIObject::HandleMessage(Message);
- // IGUITextOwner::HandleMessage(Message); performed in UpdateSeries
-
- // TODO: implement zoom
- switch (Message.type)
- {
- case GUIM_SETTINGS_UPDATED:
- {
- UpdateSeries();
- break;
- }
- }
-}
-
-void CChart::DrawLine(const CShaderProgramPtr& shader, const CGUIColor& color, const std::vector& vertices) const
-{
- shader->Uniform(str_color, color);
- shader->VertexPointer(3, GL_FLOAT, 0, &vertices[0]);
- shader->AssertPointersBound();
-
- glEnable(GL_LINE_SMOOTH);
- glLineWidth(1.1f);
- if (!g_Renderer.m_SkipSubmit)
- glDrawArrays(GL_LINE_STRIP, 0, vertices.size() / 3);
- glLineWidth(1.0f);
- glDisable(GL_LINE_SMOOTH);
-}
-
-void CChart::DrawTriangleStrip(const CShaderProgramPtr& shader, const CGUIColor& color, const std::vector& vertices) const
-{
- shader->Uniform(str_color, color);
- shader->VertexPointer(3, GL_FLOAT, 0, &vertices[0]);
- shader->AssertPointersBound();
-
- if (!g_Renderer.m_SkipSubmit)
- glDrawArrays(GL_TRIANGLE_STRIP, 0, vertices.size() / 3);
-}
-
-void CChart::DrawAxes(const CShaderProgramPtr& shader) const
-{
- const float bz = GetBufferedZ();
- CRect rect = GetChartRect();
- std::vector vertices;
- vertices.reserve(30);
-#define ADD(x, y) vertices.push_back(x); vertices.push_back(y); vertices.push_back(bz + 0.5f);
- ADD(m_CachedActualSize.right, m_CachedActualSize.bottom);
- ADD(rect.right + m_AxisWidth, rect.bottom);
- ADD(m_CachedActualSize.left, m_CachedActualSize.bottom);
- ADD(rect.left, rect.bottom);
- ADD(m_CachedActualSize.left, m_CachedActualSize.top);
- ADD(rect.left, rect.top - m_AxisWidth);
-#undef ADD
- DrawTriangleStrip(shader, m_AxisColor, vertices);
-}
-
-void CChart::Draw()
-{
- PROFILE3("render chart");
-
- if (m_Series.empty())
- return;
-
- const float bz = GetBufferedZ();
- CRect rect = GetChartRect();
- const float width = rect.GetWidth();
- const float height = rect.GetHeight();
-
- // Disable depth updates to prevent apparent z-fighting-related issues
- // with some drivers causing units to get drawn behind the texture.
- glDepthMask(0);
-
- // Setup the render state
- CMatrix3D transform = GetDefaultGuiMatrix();
- CShaderDefines lineDefines;
- CShaderTechniquePtr tech = g_Renderer.GetShaderManager().LoadEffect(str_gui_solid, g_Renderer.GetSystemShaderDefines(), lineDefines);
- tech->BeginPass();
- CShaderProgramPtr shader = tech->GetShader();
- shader->Uniform(str_transform, transform);
-
- CVector2D scale(width / (m_RightTop.X - m_LeftBottom.X), height / (m_RightTop.Y - m_LeftBottom.Y));
- for (const CChartData& data : m_Series)
- {
- if (data.m_Points.empty())
- continue;
-
- std::vector vertices;
- for (const CVector2D& point : data.m_Points)
- {
- if (fabs(point.X) != std::numeric_limits::infinity() && fabs(point.Y) != std::numeric_limits::infinity())
- {
- vertices.push_back(rect.left + (point.X - m_LeftBottom.X) * scale.X);
- vertices.push_back(rect.bottom - (point.Y - m_LeftBottom.Y) * scale.Y);
- vertices.push_back(bz + 0.5f);
- }
- else
- {
- DrawLine(shader, data.m_Color, vertices);
- vertices.clear();
- }
- }
- if (!vertices.empty())
- DrawLine(shader, data.m_Color, vertices);
- }
-
- if (m_AxisWidth > 0)
- DrawAxes(shader);
-
- tech->EndPass();
-
- // Reset depth mask
- glDepthMask(1);
-
- for (size_t i = 0; i < m_TextPositions.size(); ++i)
- DrawText(i, CGUIColor(1.f, 1.f, 1.f, 1.f), m_TextPositions[i], bz + 0.5f);
-}
-
-CRect CChart::GetChartRect() const
-{
- return CRect(
- m_CachedActualSize.TopLeft() + CPos(m_AxisWidth, m_AxisWidth),
- m_CachedActualSize.BottomRight() - CPos(m_AxisWidth, m_AxisWidth)
- );
-}
-
-void CChart::UpdateSeries()
-{
- m_Series.clear();
- m_Series.resize(m_SeriesSetting.m_Series.size());
-
- for (size_t i = 0; i < m_SeriesSetting.m_Series.size(); ++i)
- {
- CChartData& data = m_Series[i];
-
- if (i < m_SeriesColor.m_Items.size() && !data.m_Color.ParseString(m_pGUI, m_SeriesColor.m_Items[i].GetOriginalString().ToUTF8(), 0))
- LOGWARNING("GUI: Error parsing 'series_color' (\"%s\")", utf8_from_wstring(m_SeriesColor.m_Items[i].GetOriginalString()));
-
- data.m_Points = m_SeriesSetting.m_Series[i];
- }
- UpdateBounds();
-
- SetupText();
-}
-
-void CChart::SetupText()
-{
- m_GeneratedTexts.clear();
- m_TextPositions.clear();
-
- if (m_Series.empty())
- return;
-
- // Add Y-axis
- const float height = GetChartRect().GetHeight();
- // TODO: split values depend on the format;
- if (m_EqualY)
- {
- // We don't need to generate many items for equal values
- AddFormattedValue(m_FormatY, m_RightTop.Y, m_Font, m_BufferZone);
- m_TextPositions.emplace_back(GetChartRect().TopLeft());
- }
- else
- for (int i = 0; i < 3; ++i)
- {
- AddFormattedValue(m_FormatY, m_RightTop.Y - (m_RightTop.Y - m_LeftBottom.Y) / 3.f * i, m_Font, m_BufferZone);
- m_TextPositions.emplace_back(GetChartRect().TopLeft() + CPos(0.f, height / 3.f * i));
- }
-
- // Add X-axis
- const float width = GetChartRect().GetWidth();
- if (m_EqualX)
- {
- CSize text_size = AddFormattedValue(m_FormatX, m_RightTop.X, m_Font, m_BufferZone);
- m_TextPositions.emplace_back(GetChartRect().BottomRight() - text_size);
- }
- else
- for (int i = 0; i < 3; ++i)
- {
- CSize text_size = AddFormattedValue(m_FormatX, m_RightTop.X - (m_RightTop.X - m_LeftBottom.X) / 3 * i, m_Font, m_BufferZone);
- m_TextPositions.emplace_back(GetChartRect().BottomRight() - text_size - CPos(width / 3 * i, 0.f));
- }
-}
-
-CSize CChart::AddFormattedValue(const CStrW& format, const float value, const CStrW& font, const float buffer_zone)
-{
- // TODO: we need to catch cases with equal formatted values.
- CGUIString gui_str;
- if (format == L"DECIMAL2")
- {
- wchar_t buffer[64];
- swprintf(buffer, 64, L"%.2f", value);
- gui_str.SetValue(buffer);
- }
- else if (format == L"INTEGER")
- {
- wchar_t buffer[64];
- swprintf(buffer, 64, L"%d", std::lround(value));
- gui_str.SetValue(buffer);
- }
- else if (format == L"DURATION_SHORT")
- {
- const int seconds = value;
- wchar_t buffer[64];
- swprintf(buffer, 64, L"%d:%02d", seconds / 60, seconds % 60);
- gui_str.SetValue(buffer);
- }
- else if (format == L"PERCENTAGE")
- {
- wchar_t buffer[64];
- swprintf(buffer, 64, L"%d%%", std::lround(value));
- gui_str.SetValue(buffer);
- }
- else
- {
- LOGERROR("Unsupported chart format: " + format.EscapeToPrintableASCII());
- return CSize();
- }
-
- return AddText(gui_str, font, 0, buffer_zone).GetSize();
-}
-
-void CChart::UpdateBounds()
-{
- if (m_Series.empty() || m_Series[0].m_Points.empty())
- {
- m_LeftBottom = m_RightTop = CVector2D(0.f, 0.f);
- return;
- }
-
- m_LeftBottom = m_RightTop = m_Series[0].m_Points[0];
- for (const CChartData& data : m_Series)
- for (const CVector2D& point : data.m_Points)
- {
- if (fabs(point.X) != std::numeric_limits::infinity() && point.X < m_LeftBottom.X)
- m_LeftBottom.X = point.X;
- if (fabs(point.Y) != std::numeric_limits::infinity() && point.Y < m_LeftBottom.Y)
- m_LeftBottom.Y = point.Y;
-
- if (fabs(point.X) != std::numeric_limits::infinity() && point.X > m_RightTop.X)
- m_RightTop.X = point.X;
- if (fabs(point.Y) != std::numeric_limits::infinity() && point.Y > m_RightTop.Y)
- m_RightTop.Y = point.Y;
- }
-
- m_EqualY = m_RightTop.Y == m_LeftBottom.Y;
- if (m_EqualY)
- m_RightTop.Y += 1;
- m_EqualX = m_RightTop.X == m_LeftBottom.X;
- if (m_EqualX)
- m_RightTop.X += 1;
-}
Index: ps/trunk/source/gui/CCheckBox.h
===================================================================
--- ps/trunk/source/gui/CCheckBox.h
+++ ps/trunk/source/gui/CCheckBox.h
@@ -1,61 +0,0 @@
-/* Copyright (C) 2019 Wildfire Games.
- * This file is part of 0 A.D.
- *
- * 0 A.D. 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.
- *
- * 0 A.D. 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 0 A.D. If not, see .
- */
-
-#ifndef INCLUDED_CCHECKBOX
-#define INCLUDED_CCHECKBOX
-
-#include "gui/CGUISprite.h"
-#include "gui/IGUIButtonBehavior.h"
-
-class CCheckBox : public IGUIObject, public IGUIButtonBehavior
-{
- GUI_OBJECT(CCheckBox)
-
-public:
- CCheckBox(CGUI& pGUI);
- virtual ~CCheckBox();
-
- /**
- * @see IGUIObject#ResetStates()
- */
- virtual void ResetStates();
-
- /**
- * @see IGUIObject#HandleMessage()
- */
- virtual void HandleMessage(SGUIMessage& Message);
-
- /**
- * Draws the control
- */
- virtual void Draw();
-
-protected:
- // Settings
- i32 m_CellID;
- bool m_Checked;
- CGUISpriteInstance m_SpriteUnchecked;
- CGUISpriteInstance m_SpriteUncheckedOver;
- CGUISpriteInstance m_SpriteUncheckedPressed;
- CGUISpriteInstance m_SpriteUncheckedDisabled;
- CGUISpriteInstance m_SpriteChecked;
- CGUISpriteInstance m_SpriteCheckedOver;
- CGUISpriteInstance m_SpriteCheckedPressed;
- CGUISpriteInstance m_SpriteCheckedDisabled;
-};
-
-#endif // INCLUDED_CCHECKBOX
Index: ps/trunk/source/gui/CCheckBox.cpp
===================================================================
--- ps/trunk/source/gui/CCheckBox.cpp
+++ ps/trunk/source/gui/CCheckBox.cpp
@@ -1,87 +0,0 @@
-/* Copyright (C) 2019 Wildfire Games.
- * This file is part of 0 A.D.
- *
- * 0 A.D. 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.
- *
- * 0 A.D. 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 0 A.D. If not, see .
- */
-
-#include "precompiled.h"
-
-#include "CCheckBox.h"
-
-#include "gui/CGUI.h"
-
-CCheckBox::CCheckBox(CGUI& pGUI)
- : IGUIObject(pGUI),
- IGUIButtonBehavior(*static_cast(this)),
- m_CellID(),
- m_Checked(),
- m_SpriteUnchecked(),
- m_SpriteUncheckedOver(),
- m_SpriteUncheckedPressed(),
- m_SpriteUncheckedDisabled(),
- m_SpriteChecked(),
- m_SpriteCheckedOver(),
- m_SpriteCheckedPressed(),
- m_SpriteCheckedDisabled()
-{
- RegisterSetting("cell_id", m_CellID);
- RegisterSetting("checked", m_Checked),
- RegisterSetting("sprite", m_SpriteUnchecked);
- RegisterSetting("sprite_over", m_SpriteUncheckedOver);
- RegisterSetting("sprite_pressed", m_SpriteUncheckedPressed);
- RegisterSetting("sprite_disabled", m_SpriteUncheckedDisabled);
- RegisterSetting("sprite2", m_SpriteChecked);
- RegisterSetting("sprite2_over", m_SpriteCheckedOver);
- RegisterSetting("sprite2_pressed", m_SpriteCheckedPressed);
- RegisterSetting("sprite2_disabled", m_SpriteCheckedDisabled);
-}
-
-CCheckBox::~CCheckBox()
-{
-}
-
-void CCheckBox::ResetStates()
-{
- IGUIObject::ResetStates();
- IGUIButtonBehavior::ResetStates();
-}
-
-void CCheckBox::HandleMessage(SGUIMessage& Message)
-{
- IGUIObject::HandleMessage(Message);
- IGUIButtonBehavior::HandleMessage(Message);
-
- switch (Message.type)
- {
- case GUIM_PRESSED:
- {
- SetSetting("checked", !m_Checked, true);
- break;
- }
-
- default:
- break;
- }
-}
-
-void CCheckBox::Draw()
-{
- m_pGUI.DrawSprite(
- m_Checked ?
- GetButtonSprite(m_SpriteChecked, m_SpriteCheckedOver, m_SpriteCheckedPressed, m_SpriteCheckedDisabled) :
- GetButtonSprite(m_SpriteUnchecked, m_SpriteUncheckedOver, m_SpriteUncheckedPressed, m_SpriteUncheckedDisabled),
- m_CellID,
- GetBufferedZ(),
- m_CachedActualSize);
-}
Index: ps/trunk/source/gui/CDropDown.h
===================================================================
--- ps/trunk/source/gui/CDropDown.h
+++ ps/trunk/source/gui/CDropDown.h
@@ -1,142 +0,0 @@
-/* Copyright (C) 2019 Wildfire Games.
- * This file is part of 0 A.D.
- *
- * 0 A.D. 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.
- *
- * 0 A.D. 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 0 A.D. If not, see .
- */
-
-/*
-GUI Object - Drop Down (list)
-
---Overview--
-
- Works just like a list-box, but it hides
- all the elements that aren't selected. They
- can be brought up by pressing the control.
-*/
-
-#ifndef INCLUDED_CDROPDOWN
-#define INCLUDED_CDROPDOWN
-
-#include "gui/CGUISprite.h"
-#include "gui/CList.h"
-
-#include
-
-/**
- * Drop Down
- *
- * The control can be pressed, but we will not inherent
- * this behavior from IGUIButtonBehavior, because when
- * you press this control, the list with elements will
- * immediately appear, and not first after release
- * (which is the whole gist of the IGUIButtonBehavior).
- */
-class CDropDown : public CList
-{
- GUI_OBJECT(CDropDown)
-
-public:
- CDropDown(CGUI& pGUI);
- virtual ~CDropDown();
-
- /**
- * @see IGUIObject#HandleMessage()
- */
- virtual void HandleMessage(SGUIMessage& Message);
-
- /**
- * Handle events manually to catch keyboard inputting.
- */
- virtual InReaction ManuallyHandleEvent(const SDL_Event_* ev);
-
- /**
- * Draws the Button
- */
- virtual void Draw();
-
- // This is one of the few classes we actually need to redefine this function
- // this is because the size of the control changes whether it is open
- // or closed.
- virtual bool IsMouseOver() const;
-
- virtual float GetBufferedZ() const;
-
-protected:
- /**
- * If the size changed, the texts have to be updated as
- * the word wrapping depends on the size.
- */
- virtual void UpdateCachedSize();
-
- /**
- * Sets up text, should be called every time changes has been
- * made that can change the visual.
- */
- void SetupText();
-
- // Sets up the cached GetListRect. Decided whether it should
- // have a scrollbar, and so on.
- virtual void SetupListRect();
-
- // Specify a new List rectangle.
- virtual CRect GetListRect() const;
-
- /**
- * Placement of text.
- */
- CPos m_TextPos;
-
- // Is the dropdown opened?
- bool m_Open;
-
- // I didn't cache this at first, but it's just as easy as caching
- // m_CachedActualSize, so I thought, what the heck it's used a lot.
- CRect m_CachedListRect;
-
- // Hide scrollbar when it's not needed
- bool m_HideScrollBar;
-
- // Not necessarily the element that is selected, this is just
- // which element should be highlighted. When opening the dropdown
- // it is set to "selected", but then when moving the mouse it will
- // change.
- int m_ElementHighlight;
-
- // Stores any text entered by the user for quick access to an element
- // (ie if you type "acro" it will take you to acropolis).
- std::string m_InputBuffer;
-
- // used to know if we want to restart anew or add to m_inputbuffer.
- double m_TimeOfLastInput;
-
- // Settings
- float m_ButtonWidth;
- float m_DropDownSize;
- float m_DropDownBuffer;
- u32 m_MinimumVisibleItems;
- CStrW m_SoundClosed;
- CStrW m_SoundEnter;
- CStrW m_SoundLeave;
- CStrW m_SoundOpened;
- CGUISpriteInstance m_SpriteDisabled;
- CGUISpriteInstance m_SpriteList;
- CGUISpriteInstance m_Sprite2;
- CGUISpriteInstance m_Sprite2Over;
- CGUISpriteInstance m_Sprite2Pressed;
- CGUISpriteInstance m_Sprite2Disabled;
- CGUIColor m_TextColorDisabled;
- EVAlign m_TextVAlign;
-};
-
-#endif // INCLUDED_CDROPDOWN
Index: ps/trunk/source/gui/CDropDown.cpp
===================================================================
--- ps/trunk/source/gui/CDropDown.cpp
+++ ps/trunk/source/gui/CDropDown.cpp
@@ -1,505 +0,0 @@
-/* Copyright (C) 2019 Wildfire Games.
- * This file is part of 0 A.D.
- *
- * 0 A.D. 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.
- *
- * 0 A.D. 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 0 A.D. If not, see .
- */
-
-#include "precompiled.h"
-
-#include "CDropDown.h"
-
-#include "gui/CGUI.h"
-#include "gui/CGUIColor.h"
-#include "gui/CGUIList.h"
-#include "gui/IGUIScrollBar.h"
-#include "lib/external_libraries/libsdl.h"
-#include "lib/timer.h"
-#include "ps/Profile.h"
-
-CDropDown::CDropDown(CGUI& pGUI)
- : CList(pGUI),
- m_Open(),
- m_HideScrollBar(),
- m_ElementHighlight(-1),
- m_ButtonWidth(),
- m_DropDownSize(),
- m_DropDownBuffer(),
- m_MinimumVisibleItems(),
- m_SoundClosed(),
- m_SoundEnter(),
- m_SoundLeave(),
- m_SoundOpened(),
- m_SpriteDisabled(),
- m_SpriteList(),
- m_Sprite2(),
- m_Sprite2Over(),
- m_Sprite2Pressed(),
- m_Sprite2Disabled(),
- m_TextColorDisabled(),
- m_TextVAlign()
-{
- RegisterSetting("button_width", m_ButtonWidth);
- RegisterSetting("dropdown_size", m_DropDownSize);
- RegisterSetting("dropdown_buffer", m_DropDownBuffer);
- RegisterSetting("minimum_visible_items", m_MinimumVisibleItems);
- RegisterSetting("sound_closed", m_SoundClosed);
- RegisterSetting("sound_enter", m_SoundEnter);
- RegisterSetting("sound_leave", m_SoundLeave);
- RegisterSetting("sound_opened", m_SoundOpened);
- // Setting "sprite" is registered by CList and used as the background
- RegisterSetting("sprite_disabled", m_SpriteDisabled);
- RegisterSetting("sprite_list", m_SpriteList); // Background of the drop down list
- RegisterSetting("sprite2", m_Sprite2); // Button that sits to the right
- RegisterSetting("sprite2_over", m_Sprite2Over);
- RegisterSetting("sprite2_pressed", m_Sprite2Pressed);
- RegisterSetting("sprite2_disabled", m_Sprite2Disabled);
- RegisterSetting("textcolor_disabled", m_TextColorDisabled);
- RegisterSetting("text_valign", m_TextVAlign);
- // Add these in CList! And implement TODO
- //RegisterSetting("textcolor_over");
- //RegisterSetting("textcolor_pressed");
-
- // Scrollbar is forced to be true.
- SetSetting("scrollbar", true, true);
-}
-
-CDropDown::~CDropDown()
-{
-}
-
-void CDropDown::SetupText()
-{
- SetupListRect();
- CList::SetupText();
-}
-
-void CDropDown::UpdateCachedSize()
-{
- CList::UpdateCachedSize();
- SetupText();
-}
-
-void CDropDown::HandleMessage(SGUIMessage& Message)
-{
- // CList::HandleMessage(Message); placed after the switch!
-
- switch (Message.type)
- {
- case GUIM_SETTINGS_UPDATED:
- {
- // Update cached list rect
- if (Message.value == "size" ||
- Message.value == "absolute" ||
- Message.value == "dropdown_size" ||
- Message.value == "dropdown_buffer" ||
- Message.value == "minimum_visible_items" ||
- Message.value == "scrollbar_style" ||
- Message.value == "button_width")
- {
- SetupListRect();
- }
-
- break;
- }
-
- case GUIM_MOUSE_MOTION:
- {
- if (!m_Open)
- break;
-
- CPos mouse = m_pGUI.GetMousePos();
-
- if (!GetListRect().PointInside(mouse))
- break;
-
- const float scroll = m_ScrollBar ? GetScrollBar(0).GetPos() : 0.f;
-
- CRect rect = GetListRect();
- mouse.y += scroll;
- int set = -1;
- for (int i = 0; i < static_cast(m_List.m_Items.size()); ++i)
- {
- if (mouse.y >= rect.top + m_ItemsYPositions[i] &&
- mouse.y < rect.top + m_ItemsYPositions[i+1] &&
- // mouse is not over scroll-bar
- (m_HideScrollBar ||
- mouse.x < GetScrollBar(0).GetOuterRect().left ||
- mouse.x > GetScrollBar(0).GetOuterRect().right))
- {
- set = i;
- }
- }
-
- if (set != -1)
- {
- m_ElementHighlight = set;
- //UpdateAutoScroll();
- }
-
- break;
- }
-
- case GUIM_MOUSE_ENTER:
- {
- if (m_Enabled)
- PlaySound(m_SoundEnter);
- break;
- }
-
- case GUIM_MOUSE_LEAVE:
- {
- m_ElementHighlight = m_Selected;
-
- if (m_Enabled)
- PlaySound(m_SoundLeave);
- break;
- }
-
- // We can't inherent this routine from CList, because we need to include
- // a mouse click to open the dropdown, also the coordinates are changed.
- case GUIM_MOUSE_PRESS_LEFT:
- {
- if (!m_Enabled)
- {
- PlaySound(m_SoundDisabled);
- break;
- }
-
- if (!m_Open)
- {
- if (m_List.m_Items.empty())
- return;
-
- m_Open = true;
- GetScrollBar(0).SetZ(GetBufferedZ());
- m_ElementHighlight = m_Selected;
-
- // Start at the position of the selected item, if possible.
- GetScrollBar(0).SetPos(m_ItemsYPositions.empty() ? 0 : m_ItemsYPositions[m_ElementHighlight] - 60);
-
- PlaySound(m_SoundOpened);
- return; // overshadow
- }
- else
- {
- const CPos& mouse = m_pGUI.GetMousePos();
-
- // If the regular area is pressed, then abort, and close.
- if (m_CachedActualSize.PointInside(mouse))
- {
- m_Open = false;
- GetScrollBar(0).SetZ(GetBufferedZ());
- PlaySound(m_SoundClosed);
- return; // overshadow
- }
-
- if (m_HideScrollBar ||
- mouse.x < GetScrollBar(0).GetOuterRect().left ||
- mouse.x > GetScrollBar(0).GetOuterRect().right ||
- mouse.y < GetListRect().top)
- {
- m_Open = false;
- GetScrollBar(0).SetZ(GetBufferedZ());
- }
- }
- break;
- }
-
- case GUIM_MOUSE_WHEEL_DOWN:
- {
- // Don't switch elements by scrolling when open, causes a confusing interaction between this and the scrollbar.
- if (m_Open || !m_Enabled)
- break;
-
- m_ElementHighlight = m_Selected;
-
- if (m_ElementHighlight + 1 >= (int)m_ItemsYPositions.size() - 1)
- break;
-
- ++m_ElementHighlight;
- SetSetting("selected", m_ElementHighlight, true);
- break;
- }
-
- case GUIM_MOUSE_WHEEL_UP:
- {
- // Don't switch elements by scrolling when open, causes a confusing interaction between this and the scrollbar.
- if (m_Open || !m_Enabled)
- break;
-
- m_ElementHighlight = m_Selected;
- if (m_ElementHighlight - 1 < 0)
- break;
-
- --m_ElementHighlight;
- SetSetting("selected", m_ElementHighlight, true);
- break;
- }
-
- case GUIM_LOST_FOCUS:
- {
- if (m_Open)
- PlaySound(m_SoundClosed);
-
- m_Open = false;
- break;
- }
-
- case GUIM_LOAD:
- SetupListRect();
- break;
-
- default:
- break;
- }
-
- // Important that this is after, so that overshadowed implementations aren't processed
- CList::HandleMessage(Message);
-
- // As HandleMessage functions return void, we need to manually verify
- // whether the child list's items were modified.
- if (CList::GetModified())
- SetupText();
-}
-
-InReaction CDropDown::ManuallyHandleEvent(const SDL_Event_* ev)
-{
- InReaction result = IN_PASS;
- bool update_highlight = false;
-
- if (ev->ev.type == SDL_KEYDOWN)
- {
- int szChar = ev->ev.key.keysym.sym;
-
- switch (szChar)
- {
- case '\r':
- m_Open = false;
- result = IN_HANDLED;
- break;
-
- case SDLK_HOME:
- case SDLK_END:
- case SDLK_UP:
- case SDLK_DOWN:
- case SDLK_PAGEUP:
- case SDLK_PAGEDOWN:
- if (!m_Open)
- return IN_PASS;
- // Set current selected item to highlighted, before
- // then really processing these in CList::ManuallyHandleEvent()
- SetSetting("selected", m_ElementHighlight, true);
- update_highlight = true;
- break;
-
- default:
- // If we have inputed a character try to get the closest element to it.
- // TODO: not too nice and doesn't deal with dashes.
- if (m_Open && ((szChar >= SDLK_a && szChar <= SDLK_z) || szChar == SDLK_SPACE
- || (szChar >= SDLK_0 && szChar <= SDLK_9)
- || (szChar >= SDLK_KP_0 && szChar <= SDLK_KP_9)))
- {
- // arbitrary 1 second limit to add to string or start fresh.
- // maximal amount of characters is 100, which imo is far more than enough.
- if (timer_Time() - m_TimeOfLastInput > 1.0 || m_InputBuffer.length() >= 100)
- m_InputBuffer = szChar;
- else
- m_InputBuffer += szChar;
-
- m_TimeOfLastInput = timer_Time();
-
- // let's look for the closest element
- // basically it's alphabetic order and "as many letters as we can get".
- int closest = -1;
- int bestIndex = -1;
- int difference = 1250;
- for (int i = 0; i < static_cast(m_List.m_Items.size()); ++i)
- {
- int indexOfDifference = 0;
- int diff = 0;
- for (size_t j = 0; j < m_InputBuffer.length(); ++j)
- {
- diff = std::abs(static_cast(m_List.m_Items[i].GetRawString().LowerCase()[j]) - static_cast(m_InputBuffer[j]));
- if (diff == 0)
- indexOfDifference = j+1;
- else
- break;
- }
- if (indexOfDifference > bestIndex || (indexOfDifference >= bestIndex && diff < difference))
- {
- bestIndex = indexOfDifference;
- closest = i;
- difference = diff;
- }
- }
- // let's select the closest element. There should basically always be one.
- if (closest != -1)
- {
- SetSetting("selected", closest, true);
- update_highlight = true;
- GetScrollBar(0).SetPos(m_ItemsYPositions[closest] - 60);
- }
- result = IN_HANDLED;
- }
- break;
- }
- }
-
- if (CList::ManuallyHandleEvent(ev) == IN_HANDLED)
- result = IN_HANDLED;
-
- if (update_highlight)
- m_ElementHighlight = m_Selected;
-
- return result;
-}
-
-void CDropDown::SetupListRect()
-{
- extern int g_yres;
- extern float g_GuiScale;
- const float yres = g_yres / g_GuiScale;
-
- if (m_ItemsYPositions.empty())
- {
- m_CachedListRect = CRect(m_CachedActualSize.left, m_CachedActualSize.bottom + m_DropDownBuffer,
- m_CachedActualSize.right, m_CachedActualSize.bottom + m_DropDownBuffer + m_DropDownSize);
- m_HideScrollBar = false;
- }
- // Too many items so use a scrollbar
- else if (m_ItemsYPositions.back() > m_DropDownSize)
- {
- // Place items below if at least some items can be placed below
- if (m_CachedActualSize.bottom + m_DropDownBuffer + m_DropDownSize <= yres)
- m_CachedListRect = CRect(m_CachedActualSize.left, m_CachedActualSize.bottom + m_DropDownBuffer,
- m_CachedActualSize.right, m_CachedActualSize.bottom + m_DropDownBuffer + m_DropDownSize);
- else if ((m_ItemsYPositions.size() > m_MinimumVisibleItems && yres - m_CachedActualSize.bottom - m_DropDownBuffer >= m_ItemsYPositions[m_MinimumVisibleItems]) ||
- m_CachedActualSize.top < yres - m_CachedActualSize.bottom)
- m_CachedListRect = CRect(m_CachedActualSize.left, m_CachedActualSize.bottom + m_DropDownBuffer,
- m_CachedActualSize.right, yres);
- // Not enough space below, thus place items above
- else
- m_CachedListRect = CRect(m_CachedActualSize.left, std::max(0.f, m_CachedActualSize.top - m_DropDownBuffer - m_DropDownSize),
- m_CachedActualSize.right, m_CachedActualSize.top - m_DropDownBuffer);
-
- m_HideScrollBar = false;
- }
- else
- {
- // Enough space below, no scrollbar needed
- if (m_CachedActualSize.bottom + m_DropDownBuffer + m_ItemsYPositions.back() <= yres)
- {
- m_CachedListRect = CRect(m_CachedActualSize.left, m_CachedActualSize.bottom + m_DropDownBuffer,
- m_CachedActualSize.right, m_CachedActualSize.bottom + m_DropDownBuffer + m_ItemsYPositions.back());
- m_HideScrollBar = true;
- }
- // Enough space below for some items, but not all, so place items below and use a scrollbar
- else if ((m_ItemsYPositions.size() > m_MinimumVisibleItems && yres - m_CachedActualSize.bottom - m_DropDownBuffer >= m_ItemsYPositions[m_MinimumVisibleItems]) ||
- m_CachedActualSize.top < yres - m_CachedActualSize.bottom)
- {
- m_CachedListRect = CRect(m_CachedActualSize.left, m_CachedActualSize.bottom + m_DropDownBuffer,
- m_CachedActualSize.right, yres);
- m_HideScrollBar = false;
- }
- // Not enough space below, thus place items above. Hide the scrollbar accordingly
- else
- {
- m_CachedListRect = CRect(m_CachedActualSize.left, std::max(0.f, m_CachedActualSize.top - m_DropDownBuffer - m_ItemsYPositions.back()),
- m_CachedActualSize.right, m_CachedActualSize.top - m_DropDownBuffer);
- m_HideScrollBar = m_CachedActualSize.top > m_ItemsYPositions.back() + m_DropDownBuffer;
- }
- }
-}
-
-CRect CDropDown::GetListRect() const
-{
- return m_CachedListRect;
-}
-
-bool CDropDown::IsMouseOver() const
-{
- if (m_Open)
- {
- CRect rect(m_CachedActualSize.left, std::min(m_CachedActualSize.top, GetListRect().top),
- m_CachedActualSize.right, std::max(m_CachedActualSize.bottom, GetListRect().bottom));
- return rect.PointInside(m_pGUI.GetMousePos());
- }
- else
- return m_CachedActualSize.PointInside(m_pGUI.GetMousePos());
-}
-
-void CDropDown::Draw()
-{
- const float bz = GetBufferedZ();
- const CGUISpriteInstance& sprite = m_Enabled ? m_Sprite : m_SpriteDisabled;
-
- m_pGUI.DrawSprite(sprite, m_CellID, bz, m_CachedActualSize);
-
- if (m_ButtonWidth > 0.f)
- {
- CRect rect(m_CachedActualSize.right - m_ButtonWidth, m_CachedActualSize.top,
- m_CachedActualSize.right, m_CachedActualSize.bottom);
-
- if (!m_Enabled)
- {
- m_pGUI.DrawSprite(m_Sprite2Disabled || m_Sprite2, m_CellID, bz + 0.05f, rect);
- }
- else if (m_Open)
- {
- m_pGUI.DrawSprite(m_Sprite2Pressed || m_Sprite2, m_CellID, bz + 0.05f, rect);
- }
- else if (m_MouseHovering)
- {
- m_pGUI.DrawSprite(m_Sprite2Over || m_Sprite2, m_CellID, bz + 0.05f, rect);
- }
- else
- m_pGUI.DrawSprite(m_Sprite2, m_CellID, bz + 0.05f, rect);
- }
-
- if (m_Selected != -1) // TODO: Maybe check validity completely?
- {
- CRect cliparea(m_CachedActualSize.left, m_CachedActualSize.top,
- m_CachedActualSize.right - m_ButtonWidth, m_CachedActualSize.bottom);
-
- CPos pos(m_CachedActualSize.left, m_CachedActualSize.top);
- DrawText(m_Selected, m_Enabled ? m_TextColorSelected : m_TextColorDisabled, pos, bz + 0.1f, cliparea);
- }
-
- // Disable scrollbar during drawing without sending a setting-changed message
- bool old = m_ScrollBar;
-
- if (m_Open)
- {
- // TODO: drawScrollbar as an argument of DrawList?
- if (m_HideScrollBar)
- m_ScrollBar = false;
-
- DrawList(m_ElementHighlight, m_SpriteList, m_SpriteSelectArea, m_TextColor);
-
- if (m_HideScrollBar)
- m_ScrollBar = old;
- }
-}
-
-// When a dropdown list is opened, it needs to be visible above all the other
-// controls on the page. The only way I can think of to do this is to increase
-// its z value when opened, so that it's probably on top.
-float CDropDown::GetBufferedZ() const
-{
- float bz = CList::GetBufferedZ();
- if (m_Open)
- return std::min(bz + 500.f, 1000.f); // TODO - don't use magic number for max z value
- else
- return bz;
-}
Index: ps/trunk/source/gui/CGUI.h
===================================================================
--- ps/trunk/source/gui/CGUI.h
+++ ps/trunk/source/gui/CGUI.h
@@ -23,9 +23,9 @@
#ifndef INCLUDED_CGUI
#define INCLUDED_CGUI
-#include "gui/CGUIColor.h"
-#include "gui/CGUIDummyObject.h"
#include "gui/GUITooltip.h"
+#include "gui/ObjectTypes/CGUIDummyObject.h"
+#include "gui/SettingTypes/CGUIColor.h"
#include "gui/SGUIIcon.h"
#include "gui/SGUIStyle.h"
#include "lib/input.h"
Index: ps/trunk/source/gui/CGUI.cpp
===================================================================
--- ps/trunk/source/gui/CGUI.cpp
+++ ps/trunk/source/gui/CGUI.cpp
@@ -19,23 +19,22 @@
#include "CGUI.h"
-// Types - when including them into the engine.
-#include "CButton.h"
-#include "CChart.h"
-#include "CCheckBox.h"
-#include "CDropDown.h"
-#include "CImage.h"
-#include "CInput.h"
-#include "CList.h"
-#include "COList.h"
-#include "CProgressBar.h"
-#include "CRadioButton.h"
-#include "CSlider.h"
-#include "CText.h"
-#include "CTooltip.h"
-#include "MiniMap.h"
-
#include "gui/IGUIScrollBar.h"
+#include "gui/ObjectTypes/CButton.h"
+#include "gui/ObjectTypes/CChart.h"
+#include "gui/ObjectTypes/CCheckBox.h"
+#include "gui/ObjectTypes/CDropDown.h"
+#include "gui/ObjectTypes/CImage.h"
+#include "gui/ObjectTypes/CInput.h"
+#include "gui/ObjectTypes/CList.h"
+#include "gui/ObjectTypes/CMiniMap.h"
+#include "gui/ObjectTypes/COList.h"
+#include "gui/ObjectTypes/CProgressBar.h"
+#include "gui/ObjectTypes/CRadioButton.h"
+#include "gui/ObjectTypes/CSlider.h"
+#include "gui/ObjectTypes/CText.h"
+#include "gui/ObjectTypes/CTooltip.h"
+#include "gui/Scripting/ScriptFunctions.h"
#include "i18n/L10n.h"
#include "lib/bits.h"
#include "lib/input.h"
@@ -51,7 +50,6 @@
#include "ps/Pyrogenesis.h"
#include "ps/XML/Xeromyces.h"
#include "renderer/Renderer.h"
-#include "scripting/ScriptFunctions.h"
#include "scriptinterface/ScriptInterface.h"
#include
Index: ps/trunk/source/gui/CGUIColor.h
===================================================================
--- ps/trunk/source/gui/CGUIColor.h
+++ ps/trunk/source/gui/CGUIColor.h
@@ -1,61 +0,0 @@
-/* Copyright (C) 2019 Wildfire Games.
- * This file is part of 0 A.D.
- *
- * 0 A.D. 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.
- *
- * 0 A.D. 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 0 A.D. If not, see .
- */
-
-#ifndef INCLUDED_GUICOLOR
-#define INCLUDED_GUICOLOR
-
-#include "graphics/Color.h"
-#include "ps/CStr.h"
-
-class CGUI;
-
-/**
- * Same as the CColor class, but this one can also parse colors predefined in the GUI page (such as "yellow").
- */
-struct CGUIColor : CColor
-{
- // Take advantage of compiler warnings if unintentionally copying this
- NONCOPYABLE(CGUIColor);
-
- // Defines move semantics so that the structs using the class can use it.
- MOVABLE(CGUIColor);
-
- CGUIColor() : CColor() {}
-
- CGUIColor(float r, float g, float b, float a) : CColor(r, g, b, a) {}
-
- /**
- * Returns this color if it has been set, otherwise the given fallback color.
- */
- const CGUIColor& operator||(const CGUIColor& fallback) const
- {
- if (*this)
- return *this;
- return fallback;
- }
-
- /**
- * Load color depending on current GUI page.
- */
- bool ParseString(const CGUI& pGUI, const CStr& value, int defaultAlpha = 255);
-
- /**
- * Ensure that all users check for predefined colors.
- */
- bool ParseString(const CStr& value, int defaultAlpha = 255) = delete;
-};
-#endif // INCLUDED_GUICOLOR
Index: ps/trunk/source/gui/CGUIColor.cpp
===================================================================
--- ps/trunk/source/gui/CGUIColor.cpp
+++ ps/trunk/source/gui/CGUIColor.cpp
@@ -1,40 +0,0 @@
-/* Copyright (C) 2019 Wildfire Games.
- * This file is part of 0 A.D.
- *
- * 0 A.D. 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.
- *
- * 0 A.D. 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 0 A.D. If not, see .
- */
-
-#include "precompiled.h"
-
-#include "CGUIColor.h"
-
-#include "gui/CGUI.h"
-#include "ps/CStr.h"
-
-bool CGUIColor::ParseString(const CGUI& pGUI, const CStr& value, int defaultAlpha)
-{
- if (pGUI.HasPreDefinedColor(value))
- {
- const CGUIColor& color = pGUI.GetPreDefinedColor(value);
-
- // Explicit copy assignment
- r = color.r;
- g = color.g;
- b = color.b;
- a = color.a;
- return true;
- }
-
- return CColor::ParseString(value, defaultAlpha);
-}
Index: ps/trunk/source/gui/CGUIDummyObject.h
===================================================================
--- ps/trunk/source/gui/CGUIDummyObject.h
+++ ps/trunk/source/gui/CGUIDummyObject.h
@@ -1,49 +0,0 @@
-/* Copyright (C) 2019 Wildfire Games.
- * This file is part of 0 A.D.
- *
- * 0 A.D. 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.
- *
- * 0 A.D. 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 0 A.D. If not, see .
- */
-
-/*
- * This is the top class of the whole GUI, all objects
- * and settings are stored within this class.
- */
-
-#ifndef INCLUDED_CGUIDUMMYOBJECT
-#define INCLUDED_CGUIDUMMYOBJECT
-
-#include "gui/IGUIObject.h"
-
-/**
- * Dummy object are used for the base object and objects of type "empty".
- */
-class CGUIDummyObject : public IGUIObject
-{
- GUI_OBJECT(CGUIDummyObject)
-
-public:
- CGUIDummyObject(CGUI& pGUI) : IGUIObject(pGUI) {}
-
- virtual void Draw() {}
-
- /**
- * Empty can never be hovered. It is only a category.
- */
- virtual bool IsMouseOver() const
- {
- return false;
- }
-};
-
-#endif // INCLUDED_CGUIDUMMYOBJECT
Index: ps/trunk/source/gui/CGUIList.h
===================================================================
--- ps/trunk/source/gui/CGUIList.h
+++ ps/trunk/source/gui/CGUIList.h
@@ -1,43 +0,0 @@
-/* Copyright (C) 2019 Wildfire Games.
- * This file is part of 0 A.D.
- *
- * 0 A.D. 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.
- *
- * 0 A.D. 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 0 A.D. If not, see .
- */
-
-#ifndef INCLUDED_CGUILIST
-#define INCLUDED_CGUILIST
-
-#include "gui/CGUIString.h"
-
-#include
-
-class CGUIList
-{
-public: // struct:ish (but for consistency I call it _C_GUIList, and
- // for the same reason it is a class, so that confusion doesn't
- // appear when forward declaring.
-
- // Avoid copying the vector.
- NONCOPYABLE(CGUIList);
- MOVABLE(CGUIList);
- CGUIList() = default;
-
- /**
- * List of items (as text), the post-processed result is stored in
- * the IGUITextOwner structure of this class.
- */
- std::vector m_Items;
-};
-
-#endif
Index: ps/trunk/source/gui/CGUISeries.h
===================================================================
--- ps/trunk/source/gui/CGUISeries.h
+++ ps/trunk/source/gui/CGUISeries.h
@@ -1,36 +0,0 @@
-/* Copyright (C) 2019 Wildfire Games.
-* This file is part of 0 A.D.
-*
-* 0 A.D. 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.
-*
-* 0 A.D. 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 0 A.D. If not, see .
-*/
-
-
-#ifndef INCLUDED_CGUISERIES
-#define INCLUDED_CGUISERIES
-
-#include "maths/Vector2D.h"
-
-#include
-
-class CGUISeries
-{
-public:
- NONCOPYABLE(CGUISeries);
- MOVABLE(CGUISeries);
- CGUISeries() = default;
-
- std::vector> m_Series;
-};
-
-#endif // INCLUDED_CGUISERIES
Index: ps/trunk/source/gui/CGUISetting.h
===================================================================
--- ps/trunk/source/gui/CGUISetting.h
+++ ps/trunk/source/gui/CGUISetting.h
@@ -18,7 +18,7 @@
#ifndef INCLUDED_CGUISETTINGS
#define INCLUDED_CGUISETTINGS
-#include "gui/IGUIObject.h"
+#include "gui/ObjectBases/IGUIObject.h"
/**
* This setting interface allows GUI objects to call setting function functions without having to know the setting type.
Index: ps/trunk/source/gui/CGUISetting.cpp
===================================================================
--- ps/trunk/source/gui/CGUISetting.cpp
+++ ps/trunk/source/gui/CGUISetting.cpp
@@ -84,5 +84,5 @@
#define TYPE(T) \
template class CGUISetting; \
-#include "GUItypes.h"
+#include "gui/GUISettingTypes.h"
#undef TYPE
Index: ps/trunk/source/gui/CGUISize.h
===================================================================
--- ps/trunk/source/gui/CGUISize.h
+++ ps/trunk/source/gui/CGUISize.h
@@ -1,83 +0,0 @@
-/* Copyright (C) 2019 Wildfire Games.
- * This file is part of 0 A.D.
- *
- * 0 A.D. 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.
- *
- * 0 A.D. 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 0 A.D. If not, see .
- */
-
-#ifndef INCLUDED_CGUISIZE
-#define INCLUDED_CGUISIZE
-
-#include "ps/CStr.h"
-#include "ps/Errors.h"
-#include "ps/Shapes.h"
-#include "scriptinterface/ScriptInterface.h"
-
-/**
- * This class represents a rectangle relative to a parent rectangle
- * The value can be initialized from a string or JS object.
- */
-class CGUISize
-{
-public:
- // COPYABLE, since there are only primitives involved, making move and copy identical,
- // and since some temporaries cannot be avoided.
- CGUISize();
- CGUISize(const CRect& pixel, const CRect& percent);
-
- static CGUISize Full();
-
- /// Pixel modifiers
- CRect pixel;
-
- /// Percent modifiers
- CRect percent;
-
- /**
- * Get client area rectangle when the parent is given
- */
- CRect GetSize(const CRect& parent) const;
-
- /**
- * The value can be set from a string looking like:
- *
- * "0 0 100% 100%"
- * "50%-10 50%-10 50%+10 50%+10"
- *
- * i.e. First percent modifier, then + or - and the pixel modifier.
- * Although you can use just the percent or the pixel modifier. Notice
- * though that the percent modifier must always be the first when
- * both modifiers are inputted.
- *
- * @return true if success, otherwise size will remain unchanged.
- */
- bool FromString(const CStr& Value);
-
- bool operator==(const CGUISize& other) const
- {
- return pixel == other.pixel && percent == other.percent;
- }
-
- void ToJSVal(JSContext* cx, JS::MutableHandleValue ret) const;
- bool FromJSVal(JSContext* cx, JS::HandleValue v);
-};
-
-
-ERROR_GROUP(GUI);
-
-ERROR_TYPE(GUI, InvalidSetting);
-ERROR_TYPE(GUI, OperationNeedsGUIObject);
-ERROR_TYPE(GUI, NameAmbiguity);
-ERROR_TYPE(GUI, ObjectNeedsName);
-
-#endif // INCLUDED_CGUISIZE
Index: ps/trunk/source/gui/CGUISize.cpp
===================================================================
--- ps/trunk/source/gui/CGUISize.cpp
+++ ps/trunk/source/gui/CGUISize.cpp
@@ -1,232 +0,0 @@
-/* Copyright (C) 2019 Wildfire Games.
- * This file is part of 0 A.D.
- *
- * 0 A.D. 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.
- *
- * 0 A.D. 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 0 A.D. If not, see .
- */
-
-#include "precompiled.h"
-
-#include "CGUISize.h"
-
-#include "gui/scripting/JSInterface_GUISize.h"
-#include "ps/CLogger.h"
-
-CGUISize::CGUISize()
- : pixel(), percent()
-{
-}
-
-CGUISize::CGUISize(const CRect& pixel, const CRect& percent)
- : pixel(pixel), percent(percent)
-{
-}
-
-CGUISize CGUISize::Full()
-{
- return CGUISize(CRect(0, 0, 0, 0), CRect(0, 0, 100, 100));
-}
-
-CRect CGUISize::GetSize(const CRect& parent) const
-{
- // If it's a 0 0 100% 100% we need no calculations
- if (percent == CRect(0.f, 0.f, 100.f, 100.f) && pixel == CRect())
- return parent;
-
- CRect client;
-
- // This should probably be cached and not calculated all the time for every object.
- client.left = parent.left + (parent.right-parent.left)*percent.left/100.f + pixel.left;
- client.top = parent.top + (parent.bottom-parent.top)*percent.top/100.f + pixel.top;
- client.right = parent.left + (parent.right-parent.left)*percent.right/100.f + pixel.right;
- client.bottom = parent.top + (parent.bottom-parent.top)*percent.bottom/100.f + pixel.bottom;
-
- return client;
-}
-
-bool CGUISize::FromString(const CStr& Value)
-{
- /*
- * GUISizes contain a left, top, right, and bottom
- * for example: "50%-150 10%+9 50%+150 10%+25" means
- * the left edge is at 50% minus 150 pixels, the top
- * edge is at 10% plus 9 pixels, the right edge is at
- * 50% plus 150 pixels, and the bottom edge is at 10%
- * plus 25 pixels.
- * All four coordinates are required and can be
- * defined only in pixels, only in percents, or some
- * combination of both.
- */
-
- // Check the input is only numeric
- const char* input = Value.c_str();
- CStr buffer = "";
- unsigned int coord = 0;
- float pixels[4] = {0, 0, 0, 0};
- float percents[4] = {0, 0, 0, 0};
- for (unsigned int i = 0; i < Value.length(); ++i)
- {
- switch (input[i])
- {
- case '.':
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
- buffer.push_back(input[i]);
- break;
- case '+':
- pixels[coord] += buffer.ToFloat();
- buffer = "+";
- break;
- case '-':
- pixels[coord] += buffer.ToFloat();
- buffer = "-";
- break;
- case '%':
- percents[coord] += buffer.ToFloat();
- buffer = "";
- break;
- case ' ':
- pixels[coord] += buffer.ToFloat();
- buffer = "";
- ++coord;
- break;
- default:
- LOGERROR("CGUISize definition may only include numbers. Your input: '%s'", Value.c_str());
- return false;
- }
- if (coord > 3)
- {
- LOGERROR("Too many CGUISize parameters (4 max). Your input: '%s'", Value.c_str());
- return false;
- }
- }
-
- if (coord < 3)
- {
- LOGERROR("Too few CGUISize parameters (4 min). Your input: '%s'", Value.c_str());
- return false;
- }
-
- // Now that we're at the end of the string, flush the remaining buffer.
- pixels[coord] += buffer.ToFloat();
-
- // Now store the coords in the right place
- pixel.left = pixels[0];
- pixel.top = pixels[1];
- pixel.right = pixels[2];
- pixel.bottom = pixels[3];
- percent.left = percents[0];
- percent.top = percents[1];
- percent.right = percents[2];
- percent.bottom = percents[3];
- return true;
-}
-
-void CGUISize::ToJSVal(JSContext* cx, JS::MutableHandleValue ret) const
-{
- JSAutoRequest rq(cx);
- ScriptInterface* pScriptInterface = ScriptInterface::GetScriptInterfaceAndCBData(cx)->pScriptInterface;
- ret.setObjectOrNull(pScriptInterface->CreateCustomObject("GUISize"));
-
- if (!ret.isObject())
- {
- JS_ReportError(cx, "CGUISize value is not an Object");
- return;
- }
-
- JS::RootedObject obj(cx, &ret.toObject());
- if (!JS_InstanceOf(cx, obj, &JSI_GUISize::JSI_class, nullptr))
- {
- JS_ReportError(cx, "CGUISize value is not a CGUISize class instance");
- return;
- }
-
-#define P(x, y, z)\
- if (!pScriptInterface->SetProperty(ret, #z, x.y)) \
- { \
- JS_ReportError(cx, "Could not SetProperty '%s'", #z); \
- return; \
- }
- P(pixel, left, left);
- P(pixel, top, top);
- P(pixel, right, right);
- P(pixel, bottom, bottom);
- P(percent, left, rleft);
- P(percent, top, rtop);
- P(percent, right, rright);
- P(percent, bottom, rbottom);
-#undef P
-}
-
-bool CGUISize::FromJSVal(JSContext* cx, JS::HandleValue v)
-{
- JSAutoRequest rq(cx);
- ScriptInterface* pScriptInterface = ScriptInterface::GetScriptInterfaceAndCBData(cx)->pScriptInterface;
-
- if (v.isString())
- {
- CStrW str;
- if (!ScriptInterface::FromJSVal(cx, v, str))
- {
- JS_ReportError(cx, "CGUISize could not read JS string");
- return false;
- }
-
- if (!FromString(str.ToUTF8()))
- {
- JS_ReportError(cx, "CGUISize could not parse JS string");
- return false;
- }
- return true;
- }
-
- if (!v.isObject())
- {
- JS_ReportError(cx, "CGUISize value is not an String, nor Object");
- return false;
- }
-
- JS::RootedObject obj(cx, &v.toObject());
- if (!JS_InstanceOf(cx, obj, &JSI_GUISize::JSI_class, nullptr))
- {
- JS_ReportError(cx, "CGUISize value is not a CGUISize class instance");
- return false;
- }
-
-#define P(x, y, z) \
- if (!pScriptInterface->GetProperty(v, #z, x.y))\
- {\
- JS_ReportError(cx, "CGUISize could not get object property '%s'", #z);\
- return false;\
- }
-
- P(pixel, left, left);
- P(pixel, top, top);
- P(pixel, right, right);
- P(pixel, bottom, bottom);
- P(percent, left, rleft);
- P(percent, top, rtop);
- P(percent, right, rright);
- P(percent, bottom, rbottom);
-#undef P
-
- return true;
-}
Index: ps/trunk/source/gui/CGUISprite.h
===================================================================
--- ps/trunk/source/gui/CGUISprite.h
+++ ps/trunk/source/gui/CGUISprite.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_CGUISPRITE
#define INCLUDED_CGUISPRITE
-#include "gui/CGUISize.h"
#include "gui/GUIRenderer.h"
+#include "gui/SettingTypes/CGUISize.h"
#include