Fix some small theme inconsistencies

Also fixes the invisible menu separator text issue reported in #34
epilys · Mar 23, 2023 · 960dccc · 960dccc
1 parent 66c85c1
commit 960dccc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/glyphs/obj.rs b/src/glyphs/obj.rs
@@ -285,7 +285,7 @@ impl CreatePropertyWindow for GlyphMetadata {
                     let blurb = "Unicode codepoint e.g. U+67";
                     let name = "unicode";
                     let type_name: &str = "unicode codepoint";
-                    format!("<span insert_hyphens=\"true\" allow_breaks=\"true\" foreground=\"#222222\">{blurb}</span>\n\nKey: <tt>{name}</tt>\nType: <span background=\"cornflowerblue\" foreground=\"white\"><tt> {type_name} </tt></span>")
+                    format!("<span insert_hyphens=\"true\" allow_breaks=\"true\">{blurb}</span>\n\nKey: <tt>{name}</tt>\nType: <span background=\"cornflowerblue\" foreground=\"white\"><tt> {type_name} </tt></span>")
                 }).visible(true)
                 .selectable(true)
                 .wrap_mode(gtk::pango::WrapMode::Char)

diff --git a/src/themes/custom-widgets.css b/src/themes/custom-widgets.css
@@ -39,7 +39,7 @@ box.terminal-box > list > row > label {
 }
 
 .glyph-edit-toolbox {
-  background-image: image(@bg_color), image(white);
+  background-image: image(@theme_bg_color), image(@theme_base_color);
 }
 
 .glyph-edit-toolbox {
@@ -66,3 +66,8 @@ border: .05rem ridge;
 menu separator {
   min-height:2rem;
 }
+
+/* Show menu section labels */
+menu separator label, menuitem separator label  {
+  color: @theme_text_color;
+}
diff --git a/src/views/collection.rs b/src/views/collection.rs
@@ -843,9 +843,6 @@ impl ObjectImpl for GlyphBoxInner {
             let zoom_factor: f64 = obj.imp().zoom_factor.get();
             let units_per_em = obj.imp().project.get().unwrap().fontinfo().property(FontInfo::UNITS_PER_EM);
 
-            cr.set_source_rgb(1.0, 1.0, 1.0);
-            cr.paint().expect("Invalid cairo surface state");
-
             let (x, y) = (0.01, 0.01);
             let glyph = obj.imp().glyph.get().unwrap().borrow();
             let label = match glyph.kinds().0 {