From bf5180d17a56deb1f1a9b242ab382cd85b87ebf5 Mon Sep 17 00:00:00 2001
From: Doug McLain <doug@nostar.net>
Date: Wed, 21 Dec 2005 21:15:37 +0000
Subject: [PATCH] Adjusted some font sizes

git-svn-id: svn://localhost/trunk/ardour2@199 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/ardour2_ui.rc | 18 +++++++++---------
 gtk2_ardour/editor.cc     |  9 +++++++++
 gtk2_ardour/editor.h      |  1 +
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/gtk2_ardour/ardour2_ui.rc b/gtk2_ardour/ardour2_ui.rc
index bfa1acaff7..58df191617 100644
--- a/gtk2_ardour/ardour2_ui.rc
+++ b/gtk2_ardour/ardour2_ui.rc
@@ -5,7 +5,7 @@
 
 style "very_small_text"
 {
- 	font_name = "sans 8"
+ 	font_name = "sans 6"
 }
 
 style "small_text"
@@ -141,7 +141,7 @@ style "default_buttons_menus" = "default_base"
 
 style "very_small_button" = "default_buttons_menus"
 {
-	font_name = "sans 8"
+	font_name = "sans 7"
 }
 
 style "small_button" = "default_buttons_menus"
@@ -175,7 +175,7 @@ style "track_rec_enable_button" = "small_button"
 
 style "mixer_rec_enable_button" = "track_rec_enable_button"
 {
-	font_name = "sans 8"
+	font_name = "sans 7"
 }
 
 style "solo_button" = "small_button"
@@ -189,7 +189,7 @@ style "solo_button" = "small_button"
 
 style "mixer_solo_button" = "solo_button"
 {
-	font_name = "sans 8"
+	font_name = "sans 7"
 }
 
 
@@ -203,7 +203,7 @@ style "mute_button" = "small_button"
 
 style "mixer_mute_button" = "mute_button"
 {
-	font_name = "sans 8"
+	font_name = "sans 7"
 }
 
 style "track_loop_button" = "small_button"
@@ -483,7 +483,7 @@ style "editor_time_ruler" = "small_text"
 
 style "audio_track_base" = "default_base"
 {
-  font_name = "sans medium 10"
+  font_name = "sans medium 8"
   fg[NORMAL] = { 0.80, 0.80, 0.70 }	
   bg[NORMAL] = { 0.18, 0.18, 0.22 }
   bg[ACTIVE] = { 0.20, 0.20, 0.20 }	
@@ -494,14 +494,14 @@ style "audio_track_base" = "default_base"
 
 style "audio_bus_base"
 {
-  font_name = "sans medium 10"
+  font_name = "sans medium 8"
   fg[NORMAL] = { 0.7, 0.8, 0.2 }	
   bg[NORMAL] = {0, 0.36, 0.40 }	
 }
 
 style "track_name_display"
 {
-	font_name = "sans medium 10"
+	font_name = "sans medium 8"
 	fg[NORMAL] = { 0.80, 0.80, 0.70 }
 	fg[ACTIVE] = { 0.80, 0.80, 0.70 }
 
@@ -513,7 +513,7 @@ style "track_name_display"
 
 style "active_track_name_display"
 {
-	font_name = "sans medium 10"
+	font_name = "sans medium 8"
 	text[NORMAL] = { 0.26, 0.26, 0.26 }
 	base[NORMAL] = { 0.89, 0.89, 0.89 }
 }
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index a6d651961c..6f0d4a1f68 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -389,6 +389,7 @@ Editor::Editor (AudioEngine& eng)
 	controls_layout.add (edit_controls_vbox);
 	controls_layout.set_name ("EditControlsBase");
 	controls_layout.signal_size_request().connect (mem_fun(*this, &Editor::set_layout_width), false);
+	controls_layout.signal_expose_event().connect (mem_fun(*this, &Editor::layout_expose), false);
 	
 	controls_layout.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK);
 	controls_layout.signal_button_release_event().connect (mem_fun(*this, &Editor::edit_controls_button_release));
@@ -3933,5 +3934,13 @@ Editor::set_layout_width(Gtk::Requisition *r)
 	edit_controls_vbox.check_resize();
 	int w = edit_controls_vbox.get_width();
 	cerr << "set_layout_width() called w = " << w << endl;
+	
 	controls_layout.set_size_request (w, -1);
 }
+
+bool
+Editor::layout_expose (GdkEventExpose* ex)
+{
+	cerr << "layout_expose() called" << endl;
+	return TRUE;
+}
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index a5f7a39b22..27e563ccf8 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -643,6 +643,7 @@ class Editor : public PublicEditor
 
 	Gtk::Layout         controls_layout;
 	void set_layout_width(Gtk::Requisition *);
+	bool Editor::layout_expose (GdkEventExpose* ex);
 
 	Gtk::HScrollbar     edit_hscrollbar;
 	bool                edit_hscroll_dragging;