Merge pull request #2046 from weluvgoatz/textbox-fix

Semphriss · web-flow · commit 7357f40351c2 · 2022-01-11T10:18:20.000-05:00
Followup to custom menus
diff --git a/src/editor/button_widget.cpp b/src/editor/button_widget.cpp
@@ -43,12 +43,10 @@ ButtonWidget::draw(DrawingContext& context)
   }
 
   if (m_grab) {
-    context.color().draw_filled_rect(m_rect, Color(std::min(g_config->editorcolor.red + 0.4f, 1.f), std::min(g_config->editorcolor.green + 0.4f, 1.f),
-      std::min(g_config->editorcolor.blue + 0.4f, 1.f), std::min(g_config->editorcolor.alpha + 0.1f, 1.f)), 4.0f,
+    context.color().draw_filled_rect(m_rect, g_config->editorgrabcolor, 4.0f,
                                      LAYER_GUI-5);
   } else if (m_hover) {
-    context.color().draw_filled_rect(m_rect, Color(std::min(g_config->editorcolor.red + 0.4f, 1.f), std::min(g_config->editorcolor.green + 0.4f, 1.f),
-      std::min(g_config->editorcolor.blue + 0.4f, 1.f), std::max(g_config->editorcolor.alpha - 0.2f, 0.f)), 4.0f,
+    context.color().draw_filled_rect(m_rect, g_config->editorhovercolor, 4.0f,
                                      LAYER_GUI-5);
   }
 }
diff --git a/src/editor/layers_widget.cpp b/src/editor/layers_widget.cpp
@@ -65,7 +65,7 @@ EditorLayersWidget::draw(DrawingContext& context)
 
   context.color().draw_filled_rect(Rectf(Vector(0, static_cast<float>(m_Ypos)),
                                          Vector(static_cast<float>(m_Width), static_cast<float>(SCREEN_HEIGHT))),
-                                     Color(g_config->editorcolor),
+                                     g_config->editorcolor,
                                      0.0f,
                                      LAYER_GUI-10);
 
@@ -98,8 +98,7 @@ EditorLayersWidget::draw(DrawingContext& context)
 
   if (draw_rect)
   {
-    context.color().draw_filled_rect(target_rect, Color(std::min(g_config->editorcolor.red + 0.4f, 1.f), std::min(g_config->editorcolor.green + 0.4f, 1.f),
-      std::min(g_config->editorcolor.blue + 0.4f, 1.f), std::max(g_config->editorcolor.alpha - 0.2f, 0.f)), 0.0f,
+    context.color().draw_filled_rect(target_rect, g_config->editorhovercolor, 0.0f,
                                        LAYER_GUI-5);
   }
 
diff --git a/src/editor/tip.cpp b/src/editor/tip.cpp
@@ -18,6 +18,8 @@
 
 #include "supertux/colorscheme.hpp"
 #include "supertux/game_object.hpp"
+#include "supertux/gameconfig.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/resources.hpp"
 #include "util/log.hpp"
 #include "video/drawing_context.hpp"
@@ -66,7 +68,7 @@ Tip::draw(DrawingContext& context, const Vector& pos)
   auto position = pos;
   position.y += 35;
   context.color().draw_text(Resources::normal_font, m_header, position,
-                              ALIGN_LEFT, LAYER_GUI-11, ColorScheme::Menu::label_color);
+                              ALIGN_LEFT, LAYER_GUI-11, g_config->labeltextcolor);
 
   for (const auto& str : m_strings) {
     position.y += 22;
diff --git a/src/editor/toolbox_widget.cpp b/src/editor/toolbox_widget.cpp
@@ -73,7 +73,7 @@ EditorToolboxWidget::draw(DrawingContext& context)
   context.color().draw_filled_rect(Rectf(Vector(static_cast<float>(m_Xpos), 0),
                                          Vector(static_cast<float>(context.get_width()),
                                                 static_cast<float>(context.get_height()))),
-                                     Color(g_config->editorcolor),
+                                     g_config->editorcolor,
                                      0.0f, LAYER_GUI-10);
   if (m_dragging) {
     context.color().draw_filled_rect(selection_draw_rect(), Color(0.2f, 0.4f, 1.0f, 0.6f),
@@ -83,8 +83,7 @@ EditorToolboxWidget::draw(DrawingContext& context)
   if (m_hovered_item != HoveredItem::NONE)
   {
     context.color().draw_filled_rect(get_item_rect(m_hovered_item),
-                                       Color(std::min(g_config->editorcolor.red + 0.4f, 1.f), std::min(g_config->editorcolor.green + 0.4f, 1.f),
-                                         std::min(g_config->editorcolor.blue + 0.4f, 1.f), std::max(g_config->editorcolor.alpha - 0.2f, 0.f)),
+                                       g_config->editorhovercolor,
                                        0.0f, LAYER_GUI - 5);
   }
 
diff --git a/src/gui/dialog.cpp b/src/gui/dialog.cpp
@@ -199,13 +199,13 @@ Dialog::draw(DrawingContext& context)
   // draw background rect
   context.color().draw_filled_rect(bg_rect.grown(12.0f),
                                      Color(g_config->menubackcolor.red, g_config->menubackcolor.green,
-                                       g_config->menubackcolor.blue, (g_config->menubackcolor.alpha - (m_passive ? 0.5f : 0.0f))),
+                                       g_config->menubackcolor.blue, (std::max(0.f, g_config->menubackcolor.alpha - (m_passive ? 0.5f : 0.0f)))),
                                        g_config->menuroundness + 4.f,
                                      LAYER_GUI-10);
 
   context.color().draw_filled_rect(bg_rect.grown(8.0f),
                                      Color(g_config->menufrontcolor.red, g_config->menufrontcolor.green,
-                                       g_config->menufrontcolor.blue, (g_config->menufrontcolor.alpha - (m_passive ? 0.3f : 0.0f))),
+                                       g_config->menufrontcolor.blue, (std::max(0.f, g_config->menufrontcolor.alpha - (m_passive ? 0.3f : 0.0f)))),
                                        g_config->menuroundness,
                                      LAYER_GUI-10);
 
@@ -220,7 +220,7 @@ Dialog::draw(DrawingContext& context)
   // draw HL line
   context.color().draw_filled_rect(Rectf(Vector(bg_rect.get_left(), bg_rect.get_bottom() - 35),
                                          Sizef(bg_rect.get_width(), 4)),
-                                   Color(g_config->hlcolor), LAYER_GUI);
+                                   g_config->hlcolor, LAYER_GUI);
   context.color().draw_filled_rect(Rectf(Vector(bg_rect.get_left(), bg_rect.get_bottom() - 35),
                                          Sizef(bg_rect.get_width(), 2)),
                                    Color(1.0f, 1.0f, 1.0f, 1.0f), LAYER_GUI);
@@ -252,7 +252,7 @@ Dialog::draw(DrawingContext& context)
     context.color().draw_text(Resources::normal_font, m_buttons[i].text,
                               Vector(pos.x, pos.y - static_cast<float>(int(Resources::normal_font->get_height() / 2))),
                               ALIGN_CENTER, LAYER_GUI,
-                              i == m_selected_button ? ColorScheme::Menu::active_color : ColorScheme::Menu::default_color);
+                              i == m_selected_button ? g_config->activetextcolor : ColorScheme::Menu::default_color);
   }
 }
 
diff --git a/src/gui/item_back.cpp b/src/gui/item_back.cpp
@@ -18,6 +18,8 @@
 
 #include "gui/menu_manager.hpp"
 #include "supertux/colorscheme.hpp"
+#include "supertux/gameconfig.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/resources.hpp"
 #include "video/drawing_context.hpp"
 #include "video/surface.hpp"
@@ -34,7 +36,7 @@ ItemBack::draw(DrawingContext& context, const Vector& pos, int menu_width, bool
   context.color().draw_text(Resources::normal_font, get_text(),
                             Vector( pos.x + static_cast<float>(menu_width) / 2.0f,
                                     pos.y - static_cast<float>(int(Resources::normal_font->get_height()/2))),
-                            ALIGN_CENTER, LAYER_GUI, active ? ColorScheme::Menu::active_color : get_color());
+                            ALIGN_CENTER, LAYER_GUI, active ? g_config->activetextcolor : get_color());
   context.color().draw_surface(Resources::back,
                                Vector(pos.x + static_cast<float>(menu_width) / 2.0f + text_width / 2.0f  + 16.0f,
                                       pos.y - 8.0f),
diff --git a/src/gui/item_controlfield.cpp b/src/gui/item_controlfield.cpp
@@ -17,6 +17,8 @@
 #include "gui/item_controlfield.hpp"
 
 #include "supertux/colorscheme.hpp"
+#include "supertux/gameconfig.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/resources.hpp"
 #include "video/drawing_context.hpp"
 
@@ -36,7 +38,7 @@ ItemControlField::draw(DrawingContext& context, const Vector& pos, int menu_widt
   context.color().draw_text(Resources::normal_font, get_text(),
                               Vector(pos.x + 16.0f,
                                      pos.y - static_cast<float>(int(Resources::normal_font->get_height()/2))),
-                              ALIGN_LEFT, LAYER_GUI, active ? ColorScheme::Menu::active_color : get_color());
+                              ALIGN_LEFT, LAYER_GUI, active ? g_config->activetextcolor : get_color());
 }
 
 int
diff --git a/src/gui/item_floatfield.cpp b/src/gui/item_floatfield.cpp
@@ -17,6 +17,7 @@
 #include "gui/item_floatfield.hpp"
 
 #include "supertux/colorscheme.hpp"
+#include "supertux/gameconfig.hpp"
 #include "supertux/globals.hpp"
 #include "supertux/resources.hpp"
 #include "video/drawing_context.hpp"
@@ -56,7 +57,7 @@ ItemFloatField::draw(DrawingContext& context, const Vector& pos, int menu_width,
   context.color().draw_text(Resources::normal_font, get_text(),
                             Vector(pos.x + 16.0f,
                                    pos.y - Resources::normal_font->get_height() / 2.0f),
-                            ALIGN_LEFT, LAYER_GUI, active ? ColorScheme::Menu::active_color : get_color());
+                            ALIGN_LEFT, LAYER_GUI, active ? g_config->activetextcolor : get_color());
 }
 
 int
diff --git a/src/gui/item_intfield.cpp b/src/gui/item_intfield.cpp
@@ -17,6 +17,7 @@
 #include "gui/item_intfield.hpp"
 
 #include "supertux/colorscheme.hpp"
+#include "supertux/gameconfig.hpp"
 #include "supertux/globals.hpp"
 #include "supertux/resources.hpp"
 #include "video/drawing_context.hpp"
@@ -43,7 +44,7 @@ ItemIntField::draw(DrawingContext& context, const Vector& pos, int menu_width, b
   context.color().draw_text(Resources::normal_font, get_text(),
                             Vector(pos.x + 16.0f,
                                    pos.y - Resources::normal_font->get_height() / 2.0f),
-                            ALIGN_LEFT, LAYER_GUI, active ? ColorScheme::Menu::active_color : get_color());
+                            ALIGN_LEFT, LAYER_GUI, active ? g_config->activetextcolor : get_color());
 }
 
 int
diff --git a/src/gui/item_label.cpp b/src/gui/item_label.cpp
@@ -17,6 +17,8 @@
 #include "gui/item_label.hpp"
 
 #include "supertux/colorscheme.hpp"
+#include "supertux/gameconfig.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/resources.hpp"
 #include "video/drawing_context.hpp"
 
@@ -35,7 +37,7 @@ ItemLabel::draw(DrawingContext& context, const Vector& pos, int menu_width, bool
 
 Color
 ItemLabel::get_color() const {
-  return ColorScheme::Menu::label_color;
+  return g_config->labeltextcolor;
 }
 
 int
diff --git a/src/gui/item_stringselect.cpp b/src/gui/item_stringselect.cpp
@@ -18,6 +18,8 @@
 
 #include "gui/menu_manager.hpp"
 #include "supertux/colorscheme.hpp"
+#include "supertux/gameconfig.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/resources.hpp"
 #include "video/drawing_context.hpp"
 #include "video/surface.hpp"
@@ -38,7 +40,7 @@ ItemStringSelect::draw(DrawingContext& context, const Vector& pos, int menu_widt
   context.color().draw_text(Resources::normal_font, get_text(),
                               Vector(pos.x + 16.0f,
                                      pos.y - Resources::normal_font->get_height() / 2.0f),
-                              ALIGN_LEFT, LAYER_GUI, active ? ColorScheme::Menu::active_color : get_color());
+                              ALIGN_LEFT, LAYER_GUI, active ? g_config->activetextcolor : get_color());
 
   // Draw right side
   context.color().draw_surface(Resources::arrow_left,
@@ -52,7 +54,7 @@ ItemStringSelect::draw(DrawingContext& context, const Vector& pos, int menu_widt
   context.color().draw_text(Resources::normal_font, list[*selected],
                             Vector(pos.x + static_cast<float>(menu_width) - roff - 8.0f,
                                    pos.y - Resources::normal_font->get_height() / 2.0f),
-                            ALIGN_RIGHT, LAYER_GUI, active ? ColorScheme::Menu::active_color : get_color());
+                            ALIGN_RIGHT, LAYER_GUI, active ? g_config->activetextcolor : get_color());
 }
 
 int
diff --git a/src/gui/item_textfield.cpp b/src/gui/item_textfield.cpp
@@ -17,6 +17,7 @@
 #include "gui/item_textfield.hpp"
 
 #include "supertux/colorscheme.hpp"
+#include "supertux/gameconfig.hpp"
 #include "supertux/globals.hpp"
 #include "supertux/resources.hpp"
 #include "video/drawing_context.hpp"
@@ -42,7 +43,7 @@ ItemTextField::draw(DrawingContext& context, const Vector& pos, int menu_width,
   context.color().draw_text(Resources::normal_font, get_text(),
                             Vector(pos.x + 16.0f,
                                    pos.y - static_cast<float>(Resources::normal_font->get_height()) / 2.0f),
-                            ALIGN_LEFT, LAYER_GUI, active ? ColorScheme::Menu::active_color : get_color());
+                            ALIGN_LEFT, LAYER_GUI, active ? g_config->activetextcolor : get_color());
 }
 
 int
diff --git a/src/gui/item_toggle.cpp b/src/gui/item_toggle.cpp
@@ -17,6 +17,8 @@
 #include "gui/item_toggle.hpp"
 
 #include "supertux/colorscheme.hpp"
+#include "supertux/gameconfig.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/resources.hpp"
 #include "video/drawing_context.hpp"
 #include "video/surface.hpp"
@@ -43,7 +45,7 @@ ItemToggle::draw(DrawingContext& context, const Vector& pos, int menu_width, boo
 {
   context.color().draw_text(Resources::normal_font, get_text(),
                             Vector(pos.x + 16, pos.y - (Resources::normal_font->get_height()/2)),
-                            ALIGN_LEFT, LAYER_GUI, active ? ColorScheme::Menu::active_color : get_color());
+                            ALIGN_LEFT, LAYER_GUI, active ? g_config->activetextcolor : get_color());
 
   if (m_get_func()) {
     context.color().draw_surface(Resources::checkbox_checked,
diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp
@@ -613,18 +613,12 @@ Menu::draw(DrawingContext& context)
 
     context.color().draw_filled_rect(Rectf(text_rect.p1() - Vector(4,4),
                                            text_rect.p2() + Vector(4,4)),
-                                     Color(g_config->menubackcolor.red + 0.3f,
-                                       g_config->menubackcolor.green + 0.3f,
-                                       g_config->menubackcolor.blue + 0.3f,
-                                       g_config->menubackcolor.alpha),
+                                     g_config->menuhelpbackcolor,
                                      g_config->menuroundness + 4.f,
                                      LAYER_GUI);
 
     context.color().draw_filled_rect(text_rect,
-                                     Color(g_config->menufrontcolor.red + 0.2f,
-                                       g_config->menufrontcolor.green + 0.2f,
-                                       g_config->menufrontcolor.blue + 0.2f,
-                                       g_config->menufrontcolor.alpha),
+                                     g_config->menuhelpfrontcolor,
                                      g_config->menuroundness,
                                      LAYER_GUI);
 
diff --git a/src/gui/menu_item.cpp b/src/gui/menu_item.cpp
@@ -18,6 +18,8 @@
 #include "gui/menu_item.hpp"
 
 #include "supertux/colorscheme.hpp"
+#include "supertux/gameconfig.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/resources.hpp"
 #include "video/drawing_context.hpp"
 
@@ -52,7 +54,7 @@ MenuItem::draw(DrawingContext& context, const Vector& pos, int menu_width, bool
   context.color().draw_text(Resources::normal_font, m_text,
                             Vector( pos.x + static_cast<float>(menu_width) / 2.0f,
                                     pos.y - static_cast<float>(Resources::normal_font->get_height()) / 2.0f ),
-                            ALIGN_CENTER, LAYER_GUI, active ? ColorScheme::Menu::active_color : get_color());
+                            ALIGN_CENTER, LAYER_GUI, active ? g_config->activetextcolor : get_color());
 }
 
 Color
diff --git a/src/gui/menu_manager.cpp b/src/gui/menu_manager.cpp
@@ -120,13 +120,13 @@ class MenuTransition final
     // draw menu background rectangles
     context.color().draw_filled_rect(Rectf(rect.get_left() - 4, rect.get_top() - 10-4,
                                              rect.get_right() + 4, rect.get_bottom() + 10 + 4),
-                                       Color(g_config->menubackcolor),
+                                       g_config->menubackcolor,
                                        g_config->menuroundness + 4.f,
                                        LAYER_GUI-10);
 
     context.color().draw_filled_rect(Rectf(rect.get_left(), rect.get_top() - 10,
                                              rect.get_right(), rect.get_bottom() + 10),
-                                       Color(g_config->menufrontcolor),
+                                       g_config->menufrontcolor,
                                        g_config->menuroundness,
                                        LAYER_GUI-10);
   }
diff --git a/src/supertux/colorscheme.cpp b/src/supertux/colorscheme.cpp
@@ -40,6 +40,8 @@ Color Statistics::perfect_color(0.4f,1.f,0.4f);
 
 Color ColorScheme::Menu::back_color(0.2f, 0.3f, 0.4f, 0.8f);
 Color ColorScheme::Menu::front_color(0.6f, 0.7f, 0.8f, 0.5f);
+Color ColorScheme::Menu::help_back_color(0.5f, 0.6f, 0.7f, 0.8f);
+Color ColorScheme::Menu::help_front_color(0.8f, 0.9f, 1.f, 0.5f);
 Color ColorScheme::Menu::hl_color(0.6f, 0.7f, 1.f, 1.f);
 Color ColorScheme::Menu::default_color(1.f,1.f,1.f);
 Color ColorScheme::Menu::active_color(0.4f,0.66f,1.f);
@@ -69,6 +71,8 @@ Color ColorScheme::Text::reference_color(0.2f,0.6f,1.f);
 Color ColorScheme::Text::normal_color(1.f,1.f,1.f);
 
 Color ColorScheme::Editor::default_color(0.9f, 0.9f, 1.0f, 0.6f);
+Color ColorScheme::Editor::hover_color(1.f, 1.f, 1.f, 0.4f);
+Color ColorScheme::Editor::grab_color(1.f, 1.f, 1.f, 0.7f);
 Color EditorOverlayWidget::text_autotile_available_color(1.f,1.f,0.6f);
 Color EditorOverlayWidget::text_autotile_active_color(1.f,1.f,1.f);
 Color EditorOverlayWidget::text_autotile_error_color(1.f,0.2f,0.1f);
diff --git a/src/supertux/colorscheme.hpp b/src/supertux/colorscheme.hpp
@@ -27,6 +27,8 @@ class ColorScheme final
   public:
     static Color back_color;
     static Color front_color;
+    static Color help_back_color;
+    static Color help_front_color;
     static Color hl_color;
     static Color default_color;
     static Color active_color;
@@ -48,6 +50,8 @@ class ColorScheme final
   {
   public:
     static Color default_color;
+    static Color hover_color;
+    static Color grab_color;
   };
 };
 
diff --git a/src/supertux/gameconfig.cpp b/src/supertux/gameconfig.cpp
diff --git a/src/supertux/gameconfig.hpp b/src/supertux/gameconfig.hpp
diff --git a/src/supertux/menu/custom_menu_menu.cpp b/src/supertux/menu/custom_menu_menu.cpp
diff --git a/src/util/colorspace_oklab.cpp b/src/util/colorspace_oklab.cpp

Original file line number	Diff line number	Diff line change
`@@ -43,12 +43,10 @@ ButtonWidget::draw(DrawingContext& context)`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`if (m_grab) {`
`46`		`- context.color().draw_filled_rect(m_rect, Color(std::min(g_config->editorcolor.red + 0.4f, 1.f), std::min(g_config->editorcolor.green + 0.4f, 1.f),`
`47`		`- std::min(g_config->editorcolor.blue + 0.4f, 1.f), std::min(g_config->editorcolor.alpha + 0.1f, 1.f)), 4.0f,`
	`46`	`+ context.color().draw_filled_rect(m_rect, g_config->editorgrabcolor, 4.0f,`
`48`	`47`	`LAYER_GUI-5);`
`49`	`48`	`} else if (m_hover) {`
`50`		`- context.color().draw_filled_rect(m_rect, Color(std::min(g_config->editorcolor.red + 0.4f, 1.f), std::min(g_config->editorcolor.green + 0.4f, 1.f),`
`51`		`- std::min(g_config->editorcolor.blue + 0.4f, 1.f), std::max(g_config->editorcolor.alpha - 0.2f, 0.f)), 4.0f,`
	`49`	`+ context.color().draw_filled_rect(m_rect, g_config->editorhovercolor, 4.0f,`
`52`	`50`	`LAYER_GUI-5);`
`53`	`51`	`}`
`54`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ EditorLayersWidget::draw(DrawingContext& context)`
`65`	`65`
`66`	`66`	`context.color().draw_filled_rect(Rectf(Vector(0, static_cast<float>(m_Ypos)),`
`67`	`67`	`Vector(static_cast<float>(m_Width), static_cast<float>(SCREEN_HEIGHT))),`
`68`		`- Color(g_config->editorcolor),`
	`68`	`+ g_config->editorcolor,`
`69`	`69`	`0.0f,`
`70`	`70`	`LAYER_GUI-10);`
`71`	`71`
`@@ -98,8 +98,7 @@ EditorLayersWidget::draw(DrawingContext& context)`
`98`	`98`
`99`	`99`	`if (draw_rect)`
`100`	`100`	`{`
`101`		`- context.color().draw_filled_rect(target_rect, Color(std::min(g_config->editorcolor.red + 0.4f, 1.f), std::min(g_config->editorcolor.green + 0.4f, 1.f),`
`102`		`- std::min(g_config->editorcolor.blue + 0.4f, 1.f), std::max(g_config->editorcolor.alpha - 0.2f, 0.f)), 0.0f,`
	`101`	`+ context.color().draw_filled_rect(target_rect, g_config->editorhovercolor, 0.0f,`
`103`	`102`	`LAYER_GUI-5);`
`104`	`103`	`}`
`105`	`104`