More color settings

Changed files (7)

• modified libbirdfont/FileDialogTab.vala
• modified libbirdfont/LabelTool.vala
• modified libbirdfont/OverView.vala
• modified libbirdfont/SaveDialog.vala
• modified libbirdfont/SettingsItem.vala
• modified libbirdfont/TabContent.vala
• modified libbirdfont/Theme.vala

Diff

diff --git a/libbirdfont/FileDialogTab.vala b/libbirdfont/FileDialogTab.valaindex ef9c640..b7d55a3 100644--- a/libbirdfont/FileDialogTab.vala+++ b/libbirdfont/FileDialogTab.vala@@ -204,7 +204,7 @@ public class FileDialogTab : FontDisplay { 				cr.restore (); 			} else { 				cr.save ();-				Theme.color (cr, "Background 1");+				Theme.color (cr, "Foreground Inverted"); 				cr.rectangle (0, y - 14 * MainWindow.units, allocation.width, 18 * MainWindow.units); 				cr.fill (); 				cr.restore ();@@ -214,7 +214,7 @@ public class FileDialogTab : FontDisplay { 		// text 		cr.save (); 		if (dark) {-			Theme.color (cr, "Background 1");+			Theme.color (cr, "Foreground Inverted"); 		} 		cr.move_to (60, y); 		cr.set_font_size (12 * MainWindow.units);diff --git a/libbirdfont/LabelTool.vala b/libbirdfont/LabelTool.valaindex 8af0e38..d8d45a9 100644--- a/libbirdfont/LabelTool.vala+++ b/libbirdfont/LabelTool.vala@@ -68,7 +68,7 @@ public class LabelTool : Tool { 		text_height = 18;  		if (is_selected ()) {-			Theme.text_color (label_text, "Background 1");+			Theme.text_color (label_text, "Foreground Inverted"); 		} else { 			Theme.text_color (label_text, "Foreground 2"); 		}diff --git a/libbirdfont/OverView.vala b/libbirdfont/OverView.valaindex 9db0c29..06696c2 100644--- a/libbirdfont/OverView.vala+++ b/libbirdfont/OverView.vala@@ -440,7 +440,6 @@ public class OverView : FontDisplay { 		// clear canvas 		cr.save (); 		Theme.color (cr, "Background 1");-		 		cr.rectangle (0, 0, allocation.width, allocation.height); 		cr.fill (); 		cr.restore ();diff --git a/libbirdfont/SaveDialog.vala b/libbirdfont/SaveDialog.valaindex 84020cf..027d946 100644--- a/libbirdfont/SaveDialog.vala+++ b/libbirdfont/SaveDialog.vala@@ -77,7 +77,7 @@ public class SaveDialog : Dialog { 		 		save_question.widget_x = save_button.widget_x + center; 		save_question.widget_y = cy + 15 * MainWindow.units;-		Theme.text_color (save_question, "Background 1");+		Theme.text_color (save_question, "Foreground Inverted"); 		 		qh = (question_font_size + 1) * MainWindow.units; 		diff --git a/libbirdfont/SettingsItem.vala b/libbirdfont/SettingsItem.valaindex 3f7c27e..9ed081c 100644--- a/libbirdfont/SettingsItem.vala+++ b/libbirdfont/SettingsItem.vala@@ -96,7 +96,7 @@ class SettingsItem : GLib.Object { 			cr.restore (); 				 			cr.save ();-			Theme.text_color (label, "Background 1");+			Theme.text_color (label, "Foreground Inverted"); 			label.set_font_size (20 * MainWindow.units); 			label.draw_at_baseline (cr, 21 * MainWindow.units, y + 25 * MainWindow.units); 			cr.restore ();@@ -129,7 +129,7 @@ class SettingsItem : GLib.Object { 				cr.save (); 				 				if (active) {-					Theme.text_color (key_binding_text, "Background 1");+					Theme.text_color (key_binding_text, "Foreground Inverted"); 				} else { 					Theme.text_color (key_binding_text, "Foreground 2"); 				}diff --git a/libbirdfont/TabContent.vala b/libbirdfont/TabContent.valaindex 3ac5e60..352059a 100644--- a/libbirdfont/TabContent.vala+++ b/libbirdfont/TabContent.vala@@ -295,7 +295,7 @@ public class TabContent : GLib.Object { 		cr.fill (); 		cr.restore (); 		-		Theme.text_color (text_input_label, "Background 1");+		Theme.text_color (text_input_label, "Foreground Inverted"); 		 		text_input_label.widget_x = 10; 		text_input_label.widget_y = 17;diff --git a/libbirdfont/Theme.vala b/libbirdfont/Theme.valaindex 16ba827..42be67d 100644--- a/libbirdfont/Theme.vala+++ b/libbirdfont/Theme.vala@@ -109,6 +109,7 @@ public class Theme : GLib.Object { 		Theme.set_default_color ("Foreground 3", 26 / 255.0, 30 / 255.0, 32 / 255.0, 1); 		Theme.set_default_color ("Foreground 4", 40 / 255.0, 57 / 255.0, 65 / 255.0, 1); 		Theme.set_default_color ("Foreground 5", 70 / 255.0, 77 / 255.0, 83 / 255.0, 1);+		Theme.set_default_color ("Foreground Inverted", 1, 1, 1, 1); 		 		Theme.set_default_color ("Highlighted 1", 234 / 255.0, 77 / 255.0, 26 / 255.0, 1); 		@@ -154,6 +155,7 @@ public class Theme : GLib.Object { 		N_("Foreground 3"); 		N_("Foreground 4"); 		N_("Foreground 5");+		N_("Foreground Inverted"); 		 		N_("Highlighted 1"); 		N_("Highlighted Guide");