ソースを参照

LibDraw: Add ColorRole::BaseText (to be painted on ColorRole::Base)

Andreas Kling 5 年 前
コミット
aae54bdbde

+ 1 - 0
Base/res/themes/Dark.ini

@@ -26,6 +26,7 @@ WindowText=white
 Button=#555555
 ButtonText=white
 Base=#424242
+BaseText=white
 
 ThreedHighlight=#6f6f6f
 ThreedShadow1=#3d3e40

+ 1 - 0
Base/res/themes/Default.ini

@@ -27,6 +27,7 @@ Button=#d4d0c8
 ButtonText=black
 
 Base=white
+BaseText=black
 
 ThreedHighlight=white
 ThreedShadow1=#808080

+ 1 - 0
Base/res/themes/Xmas.ini

@@ -27,6 +27,7 @@ Button=#d46c64
 ButtonText=black
 
 Base=#d3d7c4
+BaseText=black
 
 ThreedHighlight=#e69e99
 ThreedShadow1=#a24841

+ 1 - 0
Libraries/LibDraw/Palette.h

@@ -31,6 +31,7 @@ public:
     Color menu_base() const { return color(ColorRole::MenuBase); }
     Color menu_selection() const { return color(ColorRole::MenuSelection); }
     Color base() const { return color(ColorRole::Base); }
+    Color base_text() const { return color(ColorRole::BaseText); }
     Color button() const { return color(ColorRole::Button); }
     Color button_text() const { return color(ColorRole::ButtonText); }
     Color threed_highlight() const { return color(ColorRole::ThreedHighlight); }

+ 1 - 0
Libraries/LibDraw/SystemTheme.cpp

@@ -54,6 +54,7 @@ RefPtr<SharedBuffer> load_system_theme(const String& path)
     DO_COLOR(Window);
     DO_COLOR(WindowText);
     DO_COLOR(Base);
+    DO_COLOR(BaseText);
     DO_COLOR(Button);
     DO_COLOR(ButtonText);
     DO_COLOR(DesktopBackground);

+ 1 - 0
Libraries/LibDraw/SystemTheme.h

@@ -27,6 +27,7 @@ enum class ColorRole {
     Button,
     ButtonText,
     Base,
+    BaseText,
     ThreedHighlight,
     ThreedShadow1,
     ThreedShadow2,

+ 2 - 0
Libraries/LibGUI/GItemView.cpp

@@ -10,6 +10,8 @@
 GItemView::GItemView(GWidget* parent)
     : GAbstractView(parent)
 {
+    set_background_role(ColorRole::Base);
+    set_foreground_role(ColorRole::BaseText);
     set_frame_shape(FrameShape::Container);
     set_frame_shadow(FrameShadow::Sunken);
     set_frame_thickness(2);

+ 1 - 0
Libraries/LibGUI/GListView.cpp

@@ -8,6 +8,7 @@ GListView::GListView(GWidget* parent)
     : GAbstractView(parent)
 {
     set_background_role(ColorRole::Base);
+    set_foreground_role(ColorRole::BaseText);
     set_frame_shape(FrameShape::Container);
     set_frame_shadow(FrameShadow::Sunken);
     set_frame_thickness(2);

+ 1 - 0
Libraries/LibGUI/GTableView.cpp

@@ -14,6 +14,7 @@ GTableView::GTableView(GWidget* parent)
     : GAbstractColumnView(parent)
 {
     set_background_role(ColorRole::Base);
+    set_foreground_role(ColorRole::BaseText);
 }
 
 GTableView::~GTableView()

+ 2 - 0
Libraries/LibGUI/GTextEditor.cpp

@@ -26,6 +26,8 @@ GTextEditor::GTextEditor(Type type, GWidget* parent)
     : GScrollableWidget(parent)
     , m_type(type)
 {
+    set_background_role(ColorRole::Base);
+    set_foreground_role(ColorRole::BaseText);
     set_document(GTextDocument::create());
     set_frame_shape(FrameShape::Container);
     set_frame_shadow(FrameShadow::Sunken);

+ 1 - 0
Libraries/LibGUI/GTreeView.cpp

@@ -25,6 +25,7 @@ GTreeView::GTreeView(GWidget* parent)
     : GAbstractColumnView(parent)
 {
     set_background_role(ColorRole::Base);
+    set_foreground_role(ColorRole::BaseText);
     set_size_columns_to_fit_content(true);
     set_headers_visible(false);
     m_expand_bitmap = GraphicsBitmap::load_from_file("/res/icons/treeview-expand.png");