From 253ab7536ac1174075afc038b261cc6d41dddf3f Mon Sep 17 00:00:00 2001 From: Peter Elliott Date: Sun, 20 Sep 2020 13:22:54 -0700 Subject: [PATCH] Base: Add the PlaceholderText attribute to themes --- Base/res/themes/Basalt.ini | 1 + Base/res/themes/Dark.ini | 1 + Base/res/themes/Default.ini | 1 + Base/res/themes/Discord.ini | 2 ++ Base/res/themes/Faux Pas.ini | 1 + Base/res/themes/Hotdog Stand.ini | 1 + Base/res/themes/Joi.ini | 1 + Base/res/themes/Nord.ini | 1 + Base/res/themes/Redmond 2000.ini | 1 + Base/res/themes/Redmond.ini | 1 + Base/res/themes/Silver.ini | 1 + Base/res/themes/Sunshine.ini | 1 + Base/res/themes/Xmas.ini | 1 + Libraries/LibGUI/TextEditor.cpp | 2 +- Libraries/LibGfx/SystemTheme.h | 1 + 15 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Base/res/themes/Basalt.ini b/Base/res/themes/Basalt.ini index 8b83a71fc2b..fb5b2553ec0 100644 --- a/Base/res/themes/Basalt.ini +++ b/Base/res/themes/Basalt.ini @@ -44,6 +44,7 @@ RubberBandBorder=#ff7f00 Link=#88c ActiveLink=#c88 VisitedLink=#c8c +PlaceholderText=#171717 Ruler=#0f0f0f RulerBorder=#2f2f2f RulerActiveText=white diff --git a/Base/res/themes/Dark.ini b/Base/res/themes/Dark.ini index 4c975776006..130d4b88790 100644 --- a/Base/res/themes/Dark.ini +++ b/Base/res/themes/Dark.ini @@ -36,6 +36,7 @@ RubberBandBorder=black Link=#88c ActiveLink=#c88 VisitedLink=#c8c +PlaceholderText=#2e2f30 Ruler=#505050 RulerBorder=#666666 RulerActiveText=white diff --git a/Base/res/themes/Default.ini b/Base/res/themes/Default.ini index b59d299e1e3..ce5ff7995e6 100644 --- a/Base/res/themes/Default.ini +++ b/Base/res/themes/Default.ini @@ -39,6 +39,7 @@ Selection=#84351a SelectionText=white InactiveSelection=#606060 InactiveSelectionText=white +PlaceholderText=#808080 RubberBandFill=#f4ca9e3c RubberBandBorder=#6e2209 Link=blue diff --git a/Base/res/themes/Discord.ini b/Base/res/themes/Discord.ini index d56722f7ab2..07fdb818ecb 100644 --- a/Base/res/themes/Discord.ini +++ b/Base/res/themes/Discord.ini @@ -31,11 +31,13 @@ Selection=#2642a6 SelectionText=white InactiveSelection=#606060 InactiveSelectionText=white +PlaceholderText=#3d3e40 RubberBandFill=#8080803c RubberBandBorder=black Link=#88c ActiveLink=#c88 VisitedLink=#c8c +PlaceholderText=#3d3e40 Ruler=#505050 RulerBorder=#666666 RulerActiveText=white diff --git a/Base/res/themes/Faux Pas.ini b/Base/res/themes/Faux Pas.ini index 2020ea2e8af..c6805798219 100644 --- a/Base/res/themes/Faux Pas.ini +++ b/Base/res/themes/Faux Pas.ini @@ -31,6 +31,7 @@ Selection=white SelectionText=black InactiveSelection=white InactiveSelectionText=black +PlaceholderText=#282828 RubberBandFill=#9f9f9f RubberBandBorder=black Link=#0000b0 diff --git a/Base/res/themes/Hotdog Stand.ini b/Base/res/themes/Hotdog Stand.ini index bea62a02a86..95bfb278d9f 100644 --- a/Base/res/themes/Hotdog Stand.ini +++ b/Base/res/themes/Hotdog Stand.ini @@ -31,6 +31,7 @@ Selection=black SelectionText=white InactiveSelection=black InactiveSelectionText=white +PlaceholderText=#b0b0b0 RubberBandFill=#fad7653c RubberBandBorder=#f4ca9e Link=blue diff --git a/Base/res/themes/Joi.ini b/Base/res/themes/Joi.ini index 3b859dee4d7..4dab14f0c5c 100644 --- a/Base/res/themes/Joi.ini +++ b/Base/res/themes/Joi.ini @@ -31,6 +31,7 @@ Selection=#80004B SelectionText=white InactiveSelection=#251AAB InactiveSelectionText=white +PlaceholderText=#800D51 RubberBandFill=#3127AB3c RubberBandBorder=#251AAB Link=#88C diff --git a/Base/res/themes/Nord.ini b/Base/res/themes/Nord.ini index 8df67376009..2fc97fe293f 100644 --- a/Base/res/themes/Nord.ini +++ b/Base/res/themes/Nord.ini @@ -31,6 +31,7 @@ Selection=#7e9dbc SelectionText=white InactiveSelection=#3b4252 InactiveSelectionText=white +PlaceholderText=#3b4252 RubberBandFill=#04434c5e RubberBandBorder=#4c566a Link=#7e9dbc diff --git a/Base/res/themes/Redmond 2000.ini b/Base/res/themes/Redmond 2000.ini index 5fac8d53ba4..b8d422452a3 100644 --- a/Base/res/themes/Redmond 2000.ini +++ b/Base/res/themes/Redmond 2000.ini @@ -35,6 +35,7 @@ Selection=#1a3584 SelectionText=white InactiveSelection=#606060 InactiveSelectionText=white +PlaceholderText=#808080 RubberBandFill=#9ecaf43c RubberBandBorder=#09226e Link=blue diff --git a/Base/res/themes/Redmond.ini b/Base/res/themes/Redmond.ini index 18b84a6a152..3a1b81d1284 100644 --- a/Base/res/themes/Redmond.ini +++ b/Base/res/themes/Redmond.ini @@ -35,6 +35,7 @@ Selection=#0000aa SelectionText=white InactiveSelection=#606060 InactiveSelectionText=white +PlaceholderText=#7f787f RubberBandFill=#8080803c RubberBandBorder=black Link=#88c diff --git a/Base/res/themes/Silver.ini b/Base/res/themes/Silver.ini index 7ff4c07efe8..5cac5c516e8 100644 --- a/Base/res/themes/Silver.ini +++ b/Base/res/themes/Silver.ini @@ -31,6 +31,7 @@ Selection=#9c9cff SelectionText=black InactiveSelection=#606060 InactiveSelectionText=white +PlaceholderText=#3b3b3b RubberBandFill=#f4ca9e3c RubberBandBorder=#6e2209 Link=blue diff --git a/Base/res/themes/Sunshine.ini b/Base/res/themes/Sunshine.ini index c2cf883e9dc..fe9e5772b07 100644 --- a/Base/res/themes/Sunshine.ini +++ b/Base/res/themes/Sunshine.ini @@ -31,6 +31,7 @@ Selection=black SelectionText=white InactiveSelection=#606060 InactiveSelectionText=white +PlaceholderText=#9397a5 RubberBandFill=#0000003c RubberBandBorder=#007f7f Link=#88c diff --git a/Base/res/themes/Xmas.ini b/Base/res/themes/Xmas.ini index ee609ef9363..2cb83429ce0 100644 --- a/Base/res/themes/Xmas.ini +++ b/Base/res/themes/Xmas.ini @@ -31,6 +31,7 @@ Selection=#84351a SelectionText=white InactiveSelection=#606060 InactiveSelectionText=white +PlaceholderText=#a24841 RubberBandFill=#0466033c RubberBandBorder=#76943c Link=blue diff --git a/Libraries/LibGUI/TextEditor.cpp b/Libraries/LibGUI/TextEditor.cpp index d885b711831..1dc7efd5542 100644 --- a/Libraries/LibGUI/TextEditor.cpp +++ b/Libraries/LibGUI/TextEditor.cpp @@ -465,7 +465,7 @@ void TextEditor::paint_event(PaintEvent& event) if (!placeholder().is_empty() && document().is_empty() && !is_focused() && line_index == 0) { auto line_rect = visual_line_rect; line_rect.set_width(font().width(placeholder())); - painter.draw_text(line_rect, placeholder(), m_text_alignment, palette().color(Gfx::ColorRole::DisabledText)); + painter.draw_text(line_rect, placeholder(), m_text_alignment, palette().color(Gfx::ColorRole::PlaceholderText)); } else if (!document().has_spans()) { // Fast-path for plain text auto color = palette().color(is_enabled() ? foreground_role() : Gfx::ColorRole::DisabledText); diff --git a/Libraries/LibGfx/SystemTheme.h b/Libraries/LibGfx/SystemTheme.h index b14b6ed59f0..5af10896a9e 100644 --- a/Libraries/LibGfx/SystemTheme.h +++ b/Libraries/LibGfx/SystemTheme.h @@ -70,6 +70,7 @@ namespace Gfx { C(MovingWindowTitle) \ C(MovingWindowTitleShadow) \ C(MovingWindowTitleStripes) \ + C(PlaceholderText) \ C(RubberBandBorder) \ C(RubberBandFill) \ C(Ruler) \