소스 검색

Base: Add the PlaceholderText attribute to themes

Peter Elliott 4 년 전
부모
커밋
253ab7536a

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 2 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 1
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);

+ 1 - 0
Libraries/LibGfx/SystemTheme.h

@@ -70,6 +70,7 @@ namespace Gfx {
     C(MovingWindowTitle)           \
     C(MovingWindowTitleShadow)     \
     C(MovingWindowTitleStripes)    \
+    C(PlaceholderText)             \
     C(RubberBandBorder)            \
     C(RubberBandFill)              \
     C(Ruler)                       \