#5776: Toolbar uses the same background colour as the panel

codereader · Oct 10, 2021 · 3958baa · 3958baa
1 parent a25a9fd
commit 3958baa
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 0 deletions.
diff --git a/install/ui/texturetoolmanipulationpanel.fbp b/install/ui/texturetoolmanipulationpanel.fbp
@@ -54,6 +54,63 @@
                 <property name="name">bSizer1</property>
                 <property name="orient">wxVERTICAL</property>
                 <property name="permission">none</property>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">0</property>
+                    <property name="flag">wxEXPAND | wxALL</property>
+                    <property name="proportion">0</property>
+                    <object class="wxPanel" expanded="1">
+                        <property name="BottomDockable">1</property>
+                        <property name="LeftDockable">1</property>
+                        <property name="RightDockable">1</property>
+                        <property name="TopDockable">1</property>
+                        <property name="aui_layer"></property>
+                        <property name="aui_name"></property>
+                        <property name="aui_position"></property>
+                        <property name="aui_row"></property>
+                        <property name="best_size"></property>
+                        <property name="bg">48,48,48</property>
+                        <property name="caption"></property>
+                        <property name="caption_visible">1</property>
+                        <property name="center_pane">0</property>
+                        <property name="close_button">1</property>
+                        <property name="context_help"></property>
+                        <property name="context_menu">1</property>
+                        <property name="default_pane">0</property>
+                        <property name="dock">Dock</property>
+                        <property name="dock_fixed">0</property>
+                        <property name="docking">Left</property>
+                        <property name="enabled">0</property>
+                        <property name="fg"></property>
+                        <property name="floatable">1</property>
+                        <property name="font"></property>
+                        <property name="gripper">0</property>
+                        <property name="hidden">0</property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="max_size"></property>
+                        <property name="maximize_button">0</property>
+                        <property name="maximum_size">-1,1</property>
+                        <property name="min_size"></property>
+                        <property name="minimize_button">0</property>
+                        <property name="minimum_size"></property>
+                        <property name="moveable">1</property>
+                        <property name="name">m_panel12</property>
+                        <property name="pane_border">1</property>
+                        <property name="pane_position"></property>
+                        <property name="pane_size"></property>
+                        <property name="permission">protected</property>
+                        <property name="pin_button">1</property>
+                        <property name="pos"></property>
+                        <property name="resize">Resizable</property>
+                        <property name="show">1</property>
+                        <property name="size">-1,1</property>
+                        <property name="subclass">; ; forward_declare</property>
+                        <property name="toolbar_pane">0</property>
+                        <property name="tooltip"></property>
+                        <property name="window_extra_style"></property>
+                        <property name="window_name"></property>
+                        <property name="window_style"></property>
+                    </object>
+                </object>
                 <object class="sizeritem" expanded="1">
                     <property name="border">8</property>
                     <property name="flag">wxEXPAND | wxALL</property>

diff --git a/install/ui/texturetoolmanipulationpanel.xrc b/install/ui/texturetoolmanipulationpanel.xrc
@@ -5,6 +5,16 @@
 		<bg>#ababab</bg>
 		<object class="wxBoxSizer">
 			<orient>wxVERTICAL</orient>
+			<object class="sizeritem">
+				<option>0</option>
+				<flag>wxEXPAND | wxALL</flag>
+				<border>0</border>
+				<object class="wxPanel" name="m_panel12">
+					<size>-1,1</size>
+					<bg>#303030</bg>
+					<enabled>0</enabled>
+				</object>
+			</object>
 			<object class="sizeritem">
 				<option>0</option>
 				<flag>wxEXPAND | wxALL</flag>

diff --git a/radiant/textool/TexTool.cpp b/radiant/textool/TexTool.cpp
@@ -113,6 +113,9 @@ void TexTool::populateWindow()
 
 	if (textoolbar != nullptr)
 	{
+#ifdef __WXMSW__
+        textoolbar->SetBackgroundColour(wxColor("#ababab"));
+#endif
 		textoolbar->SetCanFocus(false);
 		GetSizer()->Add(textoolbar, 0, wxEXPAND);
     }