Skip to content

Commit 5d4d256

Browse files
committed
update Match Field
1 parent cfeaff3 commit 5d4d256

File tree

2 files changed

+15
-20
lines changed

2 files changed

+15
-20
lines changed

src/ResultDock.cpp

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -677,32 +677,30 @@ void ResultDock::applyTheme()
677677
}
678678

679679
// Caret line
680-
S(SCI_INDICSETSTYLE, 0, INDIC_ROUNDBOX);
681-
S(SCI_INDICSETFORE, 0, selBg);
682-
S(SCI_INDICSETALPHA, 0, theme.caretLineAlpha);
683-
S(SCI_INDICSETUNDER, 0, TRUE);
680+
//S(SCI_INDICSETSTYLE, 0, INDIC_ROUNDBOX);
681+
//S(SCI_INDICSETFORE, 0, selBg);
682+
//S(SCI_INDICSETALPHA, 0, theme.caretLineAlpha);
683+
//S(SCI_INDICSETUNDER, 0, TRUE);
684684
S(SCI_SETCARETLINEVISIBLE, TRUE, 0);
685685
S(SCI_SETCARETLINEBACK, theme.caretLineBg, 0);
686686
S(SCI_SETCARETLINEBACKALPHA, theme.caretLineAlpha);
687+
687688

688689
// Line background indicator
689-
S(SCI_INDICSETSTYLE, INDIC_LINE_BACKGROUND, INDIC_STRAIGHTBOX);
690-
S(SCI_INDICSETFORE, INDIC_LINE_BACKGROUND, theme.lineBg);
691-
S(SCI_INDICSETALPHA, INDIC_LINE_BACKGROUND, 100);
692-
S(SCI_INDICSETUNDER, INDIC_LINE_BACKGROUND, TRUE);
690+
S(SCI_INDICSETSTYLE, INDIC_LINE_BACKGROUND, INDIC_HIDDEN);
693691

694692
// Line number indicator
695693
S(SCI_INDICSETSTYLE, INDIC_LINENUMBER_FORE, INDIC_TEXTFORE);
696694
S(SCI_INDICSETFORE, INDIC_LINENUMBER_FORE, theme.lineNr);
697695

698696
// Match background and foreground indicators
699697
if (dark) {
700-
// Dark Mode: Nur Textfarbe (kein Hintergrund)
698+
// Dark Mode: Just Textcolor
701699
S(SCI_INDICSETSTYLE, INDIC_MATCH_BG, INDIC_HIDDEN);
702700
}
703701
else {
704-
// Light Mode: Gelber Hintergrund sichtbar
705-
COLORREF matchBg = RGB(255, 255, 160); // hellgelb
702+
// Light Mode: Yellow BAckground
703+
COLORREF matchBg = RGB(255, 255, 160);
706704
S(SCI_INDICSETSTYLE, INDIC_MATCH_BG, INDIC_STRAIGHTBOX);
707705
S(SCI_INDICSETFORE, INDIC_MATCH_BG, matchBg);
708706
S(SCI_INDICSETALPHA, INDIC_MATCH_BG, 100);
@@ -711,7 +709,7 @@ void ResultDock::applyTheme()
711709

712710
// Rote Match-Farbe
713711
S(SCI_INDICSETSTYLE, INDIC_MATCH_FORE, INDIC_TEXTFORE);
714-
S(SCI_INDICSETFORE, INDIC_MATCH_FORE, theme.matchFg); // z. B. RGB(255, 0, 0)
712+
S(SCI_INDICSETFORE, INDIC_MATCH_FORE, theme.matchFg);
715713
S(SCI_INDICSETUNDER, INDIC_MATCH_FORE, TRUE);
716714

717715
// Header style
@@ -722,7 +720,7 @@ void ResultDock::applyTheme()
722720

723721
// File path style
724722
S(SCI_STYLESETFORE, STYLE_FILEPATH, theme.filePathFg);
725-
S(SCI_STYLESETBACK, STYLE_FILEPATH, editorBg); // statt -1 für sauberen Hintergrund
723+
S(SCI_STYLESETBACK, STYLE_FILEPATH, editorBg);
726724
S(SCI_STYLESETBOLD, STYLE_FILEPATH, TRUE);
727725
S(SCI_STYLESETITALIC, STYLE_FILEPATH, TRUE);
728726
S(SCI_STYLESETEOLFILLED, STYLE_FILEPATH, TRUE);

src/ResultDock.h

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ class ResultDock final
9090
COLORREF lineBg;
9191
COLORREF lineNr;
9292
COLORREF matchFg;
93-
COLORREF matchBg;
9493
COLORREF headerBg;
9594
COLORREF headerFg;
9695
COLORREF filePathFg;
@@ -104,28 +103,26 @@ class ResultDock final
104103
RGB(0xEE, 0xEE, 0xEE), // lineBg
105104
RGB(0x40, 0x80, 0xBF), // lineNr
106105
RGB(0xFA, 0x3F, 0x34), // matchFg
107-
RGB(0xFF, 0xFF, 0xBF), // matchBg
108106
RGB(0xD5, 0xFF, 0xD5), // headerBg
109107
RGB(0x00, 0x00, 0x00), // headerFg
110108
RGB(0xA0, 0x80, 0x50), // filePathFg
111109
RGB(0x50, 0x50, 0x50), // foldGlyph
112110
RGB(0xFF, 0x00, 0x00), // foldHighlight
113-
RGB(0xEE, 0xEE, 0xFF), // caretLineBg
114-
64 // caretLineAlpha
111+
RGB(0x87, 0x78, 0xCD), // caretLineBg
112+
45 // caretLineAlpha
115113
};
116114

117115
static constexpr DockThemeColors DarkDockTheme = {
118116
RGB(0x3A, 0x3D, 0x33), // lineBg
119117
RGB(0x80, 0xC0, 0xFF), // lineNr
120118
RGB(0xA6, 0xE2, 0x2E), // matchFg
121-
RGB(0x00, 0x00, 0x00), // matchBg (unused in dark mode)
122119
RGB(0x8F, 0xAF, 0x9F), // headerBg
123120
RGB(0x00, 0x00, 0x00), // headerFg
124121
RGB(0xEB, 0xCB, 0x8B), // filePathFg
125122
RGB(0x80, 0x80, 0x80), // foldGlyph
126123
RGB(0x79, 0x94, 0x86), // foldHighlight
127-
RGB(0x44, 0x44, 0x44), // caretLineBg
128-
64 // caretLineAlpha
124+
RGB(0xAA, 0xAA, 0xAA), // caretLineBg
125+
64 // caretLineAlpha
129126
};
130127

131128
static constexpr const DockThemeColors& currentColors(bool darkMode) {

0 commit comments

Comments
 (0)