minor colour update to GTK builds

eranif · Apr 17, 2022 · 9a30fcd · 9a30fcd
1 parent 441c4bb
commit 9a30fcd
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/Plugin/clSystemSettings.cpp b/Plugin/clSystemSettings.cpp
@@ -174,6 +174,11 @@ wxColour clSystemSettings::GetDefaultPanelColour()
 {
     wxColour panel_colour;
     panel_colour = GetColour(IS_GTK ? wxSYS_COLOUR_WINDOW : wxSYS_COLOUR_3DFACE);
+#ifdef __WXGTK__
+    if(!m_useCustomColours && !DrawingUtils::IsDark(panel_colour)) {
+        panel_colour = panel_colour.ChangeLightness(95);
+    }
+#endif
     return panel_colour;
 }
 

diff --git a/Plugin/clThemedTextCtrl.cpp b/Plugin/clThemedTextCtrl.cpp
@@ -16,16 +16,19 @@
 #define wxSTC_MAX_MARGIN 4
 #endif
 
+#if defined(__WXMSW__)
+#define BORDER_STYLE wxBORDER_SIMPLE
+#elif defined(__WXGTK__)
+#define BORDER_STYLE wxBORDER_DEFAULT
+#else
+#define BORDER_STYLE wxBORDER_DEFAULT
+#endif
+
 clThemedTextCtrl::clThemedTextCtrl(wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos,
                                    const wxSize& size, long style)
 {
     wxUnusedVar(style);
-#ifdef __WXMSW__
-    wxStyledTextCtrl::Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE);
-#else
-    wxStyledTextCtrl::Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_DEFAULT);
-#endif
-
+    wxStyledTextCtrl::Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, BORDER_STYLE);
     ApplySettings();
 
     SetYCaretPolicy(0, 0);

diff --git a/Plugin/lexer_configuration.cpp b/Plugin/lexer_configuration.cpp
@@ -689,12 +689,16 @@ void LexerConf::SetKeyWords(const wxString& keywords, int set)
 void LexerConf::ApplySystemColours(wxStyledTextCtrl* ctrl)
 {
     Apply(ctrl);
+    wxColour fg_colour = clSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
     wxColour bg_colour = clSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX);
     if(!DrawingUtils::IsDark(bg_colour)) {
         bg_colour = *wxWHITE;
+    } else {
+        // dark colour, make it a bit darker
+        bg_colour = bg_colour.ChangeLightness(50);
+        fg_colour = wxColour(*wxWHITE).ChangeLightness(90);
     }
 
-    wxColour fg_colour = clSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
     for(int i = 0; i < wxSTC_STYLE_MAX; ++i) {
         ctrl->StyleSetBackground(i, bg_colour);
         ctrl->StyleSetForeground(i, fg_colour);