Skip to content

Commit 28bf625

Browse files
committed
[Gui] fix titlebar color for popup window
1 parent 763425c commit 28bf625

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

firedm/tkview.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@
8383
RCM_AFG = None
8484

8585
# titlebar
86-
TITLE_BAR_BG = '#3e474e'
87-
TITLE_BAR_FG = 'white'
86+
TITLE_BAR_BG = None
87+
TITLE_BAR_FG = None
8888

8989

9090
themes_table = {
@@ -126,7 +126,7 @@
126126
'RCM_AFG': 'white',
127127

128128
# title bar
129-
'TITLE_BAR_BG': '#006cff', #'#3e474e'
129+
'TITLE_BAR_BG': '#006cff',
130130
'TITLE_BAR_FG': 'white'
131131

132132
},
@@ -136,21 +136,21 @@
136136
"BTN_FG": "black", "BTN_HBG": "#0c1c18", "BTN_ABG": "#0c1c18", "BTN_AFG": "white", "HDG_BG": "#ffffff",
137137
"HDG_FG": "black", "THUMBNAIL_BD": "#0c1c18", "SBAR_BG": "#313328", "SBAR_FG": "white",
138138
"RCM_BG": "#313328", "RCM_FG": "white", "RCM_ABG": "#ffffff", "RCM_AFG": "black",
139-
"TITLE_BAR_BG": "#006cff", "TITLE_BAR_FG": "white"},
139+
"TITLE_BAR_BG": "#ffffff", "TITLE_BAR_FG": "black"},
140140
"dark2": {"MAIN_BG": "#2b2b2b", "MAIN_FG": "white", "SF_BG": "#3c3f41", "SF_FG": "white", "SF_BTN_BG": "#ffffff",
141141
"SF_CHKMARK": "#ffffff", "THUMBNAIL_BG": "#3c3f41", "THUMBNAIL_FG": "white", "PBAR_BG": "#353535",
142142
"PBAR_FG": "white", "PBAR_TXT": "white", "ENTRY_BD_COLOR": "#3c3f41", "BTN_BG": "#ffffff",
143143
"BTN_FG": "black", "BTN_HBG": "#3c3f41", "BTN_ABG": "#3c3f41", "BTN_AFG": "white", "HDG_BG": "#ffffff",
144144
"HDG_FG": "black", "THUMBNAIL_BD": "white", "SBAR_BG": "#2b2b2b", "SBAR_FG": "white", "RCM_BG": "#2b2b2b",
145-
"RCM_FG": "white", "RCM_ABG": "#ffffff", "RCM_AFG": "black", "TITLE_BAR_BG": "#006cff",
146-
"TITLE_BAR_FG": "white"},
145+
"RCM_FG": "white", "RCM_ABG": "#ffffff", "RCM_AFG": "black", "TITLE_BAR_BG": "#ffffff",
146+
"TITLE_BAR_FG": "black"},
147147
"dark": {"MAIN_BG": "#1c1c21", "MAIN_FG": "white", "SF_BG": "#000300", "SF_FG": "white", "SF_BTN_BG": "#d9dc4b",
148148
"SF_CHKMARK": "#d9dc4b", "THUMBNAIL_BG": "#000300", "THUMBNAIL_FG": "#d9dc4b", "PBAR_BG": "#26262b",
149149
"PBAR_FG": "#d9dc4b", "PBAR_TXT": "white", "ENTRY_BD_COLOR": "#000300", "BTN_BG": "#d9dc4b",
150150
"BTN_FG": "black", "BTN_HBG": "#000300", "BTN_ABG": "#000300", "BTN_AFG": "white", "HDG_BG": "#d9dc4b",
151151
"HDG_FG": "black", "THUMBNAIL_BD": "#d9dc4b", "SBAR_BG": "#1c1c21", "SBAR_FG": "white",
152152
"RCM_BG": "#1c1c21", "RCM_FG": "white", "RCM_ABG": "#d9dc4b", "RCM_AFG": "black",
153-
"TITLE_BAR_BG": "#006cff", "TITLE_BAR_FG": "white"}
153+
"TITLE_BAR_BG": "#d9dc4b", "TITLE_BAR_FG": "black"}
154154
}
155155

156156
# hold all user defined themes, previously created themes will be loaded from disk
@@ -497,6 +497,10 @@ def set_font(key, bg_key):
497497
set_key('RCM_ABG', 'BTN_BG')
498498
set_font('RCM_AFG', 'RCM_ABG')
499499

500+
# title bar
501+
set_key('TITLE_BAR_BG', 'BTN_BG')
502+
set_key('TITLE_BAR_FG', 'BTN_FG')
503+
500504

501505
class Button(tk.Button):
502506
"""normal tk button that follows current theme and act as a transparent if it has an image"""

0 commit comments

Comments
 (0)