Shift+Scroll scrolls horizontally and hover state for buttons

Changed files (5)

• modified libbirdfont/Glyph.vala
• modified libbirdfont/OverView.vala
• modified libbirdfont/Theme.vala
• modified resources/bright.theme
• modified resources/dark.theme

Diff

diff --git a/libbirdfont/Glyph.vala b/libbirdfont/Glyph.valaindex 70ff657..12b61c9 100644--- a/libbirdfont/Glyph.vala+++ b/libbirdfont/Glyph.vala@@ -406,9 +406,15 @@ public class Glyph : FontDisplay { 			} else { 				zoom_out_at_point (x, y, pixeldelta_y); 			}-		} else { -			view_offset_x -= pixeldelta_x / view_zoom;-			view_offset_y -= pixeldelta_y / view_zoom;+		} else {+			if (!KeyBindings.has_shift ()) {+				view_offset_x -= pixeldelta_x / view_zoom;+				view_offset_y -= pixeldelta_y / view_zoom;+			} else {+				// move canvas a long x axis instead of y+				view_offset_x -= pixeldelta_y / view_zoom;+				view_offset_y -= pixeldelta_x / view_zoom;+			} 		} 		 		redraw_area (0, 0, allocation.width, allocation.height);diff --git a/libbirdfont/OverView.vala b/libbirdfont/OverView.valaindex 07b2d56..3e84240 100644--- a/libbirdfont/OverView.vala+++ b/libbirdfont/OverView.vala@@ -222,8 +222,10 @@ public class OverView : FontDisplay { 			 			GlyphRange r = CharDatabase.search (q); 			o.set_current_glyph_range (r);-			TabContent.hide_text_input (); 			MainWindow.get_tab_bar ().select_tab_name ("Overview");+	+			TextListener tl = new TextListener (t_("Search"), o.search_query, t_("Filter"));+			TabContent.show_text_input (tl); 		}); 		 		TabContent.show_text_input (listener);diff --git a/libbirdfont/Theme.vala b/libbirdfont/Theme.valaindex 90cea5d..acc2660 100644--- a/libbirdfont/Theme.vala+++ b/libbirdfont/Theme.vala@@ -153,7 +153,7 @@ public class Theme : GLib.Object { 		Theme.set_default_color ("Button Background 3", 242 / 255.0, 246 / 255.0, 246 / 255.0, 1);  		Theme.set_default_color ("Button Border 4", 173 / 255.0, 176 / 255.0, 188 / 255.0, 1);-		Theme.set_default_color ("Button Background 4", 242 / 255.0, 246 / 255.0, 246 / 255.0, 1);+		Theme.set_default_color ("Button Background 4", 233 / 255.0, 233 / 255.0, 233 / 255.0, 1); 		 		Theme.set_default_color ("Button Foreground", 3 / 255.0, 16 / 255.0, 24 / 255.0, 1); 		Theme.set_default_color ("Selected Button Foreground", 3 / 255.0, 16 / 255.0, 24 / 255.0, 1);@@ -260,7 +260,7 @@ public class Theme : GLib.Object { 		Theme.set_default_color ("Button Background 3", 44 / 255.0, 47 / 255.0, 51 / 255.0, 1);  		Theme.set_default_color ("Button Border 4", 39 / 255.0, 40 / 255.0, 44 / 255.0, 1);-		Theme.set_default_color ("Button Background 4", 44 / 255.0, 47 / 255.0, 51 / 255.0, 1);+		Theme.set_default_color ("Button Background 4", 38 / 255.0, 41 / 255.0, 44 / 255.0, 1); 		 		Theme.set_default_color ("Button Foreground", 255 / 255.0, 255 / 255.0, 255 / 255.0, 1); 		Theme.set_default_color ("Selected Button Foreground", 107 / 255.0, 112 / 255.0, 122 / 255.0, 1);diff --git a/resources/bright.theme b/resources/bright.themeindex bf173cf..bc22d85 100644--- a/resources/bright.theme+++ b/resources/bright.theme@@ -38,7 +38,7 @@ 	<color name="Button Background 3" red="0.94901960784313721" green="0.96470588235294119" blue="0.96470588235294119" alpha="1"/> 	<color name="Selection Border" red="0.15686274509803921" green="0.22352941176470589" blue="0.25490196078431371" alpha="1"/> 	<color name="Button Border 3" red="0.67843137254901964" green="0.69019607843137254" blue="0.73725490196078436" alpha="1"/>-	<color name="Button Background 4" red="0.94901960784313721" green="0.96470588235294119" blue="0.96470588235294119" alpha="1"/>+	<color name="Button Background 4" red="0.9137254901960784" green="0.9137254901960784" blue="0.9137254901960784" alpha="1"/> 	<color name="Background Glyph" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="0.5"/> 	<color name="Default Background" red="0.93333333333333335" green="0.93725490196078431" blue="0.95294117647058818" alpha="1"/> 	<color name="Handle Color" red="0.55294117647058827" green="0.55294117647058827" blue="0.55294117647058827" alpha="1"/>diff --git a/resources/dark.theme b/resources/dark.themeindex 3baa5f0..4eab6e8 100644--- a/resources/dark.theme+++ b/resources/dark.theme@@ -38,7 +38,7 @@ 	<color name="Button Background 3" red="0.17254901960784313" green="0.18431372549019609" blue="0.20000000000000001" alpha="1"/> 	<color name="Selection Border" red="0.15686274509803921" green="0.22352941176470589" blue="0.25490196078431371" alpha="1"/> 	<color name="Button Border 3" red="0.15294117647058825" green="0.15686274509803921" blue="0.17254901960784313" alpha="1"/>-	<color name="Button Background 4" red="0.17254901960784313" green="0.18431372549019609" blue="0.20000000000000001" alpha="1"/>+	<color name="Button Background 4" red="0.14901960784313725" green="0.16078431372549021" blue="0.17254901960784313" alpha="1"/> 	<color name="Background Glyph" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="0.5"/> 	<color name="Default Background" red="0.21568627450980393" green="0.2196078431372549" blue="0.24313725490196078" alpha="1"/> 	<color name="Handle Color" red="0.55294117647058827" green="0.55294117647058827" blue="0.55294117647058827" alpha="1"/>