ardour/livetrax
13
0
Fork 0
Code

fix for height of editor hscrollbar

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@1337 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-01-17 14:53:27 +00:00
parent 76c25a4a44
commit 838a37a4fe
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk2_ardour/ardour2_ui.rc
View File

@ -322,6 +322,17 @@ style "ardour_adjusters" = "default_buttons_menus"
bg[ACTIVE] = { 0.06, 0.06, 0.06 } bg[ACTIVE] = { 0.06, 0.06, 0.06 }
} }
style "editor_hscrollbar" = "ardour_adjusters"
{
#
# special case: we want this scrollbar to be as tall as the
# zoom focus selector combobox. scrollbars don't expand to
# fill the space available to them, so we have to explicitly
# make it bigger.
#
GtkRange::slider_width = 27
}
style "ardour_progressbars" = "default_buttons_menus" style "ardour_progressbars" = "default_buttons_menus"
{ {
bg[NORMAL] = { 0, 0, 0 } bg[NORMAL] = { 0, 0, 0 }
@ -1346,6 +1357,7 @@ widget "*PanningLinkDirectionButton.*" style "very_small_button"
widget "*ChannelCountSelector" style "medium_bold_entry" widget "*ChannelCountSelector" style "medium_bold_entry"
widget "*ChannelCountSelector.GtkArrow" style "default_buttons_menus" widget "*ChannelCountSelector.GtkArrow" style "default_buttons_menus"
widget "*RegionListWholeFile" style "treeview_parent_node" widget "*RegionListWholeFile" style "treeview_parent_node"
widget "*EditorHScrollbar" style "editor_hscrollbar"
class "GtkWidget" style "default_base" class "GtkWidget" style "default_base"
class "GtkScrollbar" style "ardour_adjusters" class "GtkScrollbar" style "ardour_adjusters"

11
gtk2_ardour/audio_clock.cc
View File

@ -768,6 +768,17 @@ AudioClock::field_key_release_event (GdkEventKey *ev, Field field)
// Check SMPTE fields for sanity (may also adjust fields) // Check SMPTE fields for sanity (may also adjust fields)
smpte_sanitize_display(); smpte_sanitize_display();
break; break;
case Bars:
case Beats:
case Ticks:
// Bars or beats should never be 0
if (atoi(bars_label.get_text()) == 0) {
bars_label.set_text("001");
}
if (atoi(beats_label.get_text()) == 0) {
beats_label.set_text("01");
}
break;
default: default:
break; break;
} }

4
gtk2_ardour/editor.cc
View File

@ -359,6 +359,8 @@ Editor::Editor (AudioEngine& eng)
edit_hscrollbar.signal_button_release_event().connect (mem_fun(*this, &Editor::hscrollbar_button_release)); edit_hscrollbar.signal_button_release_event().connect (mem_fun(*this, &Editor::hscrollbar_button_release));
edit_hscrollbar.signal_size_allocate().connect (mem_fun(*this, &Editor::hscrollbar_allocate)); edit_hscrollbar.signal_size_allocate().connect (mem_fun(*this, &Editor::hscrollbar_allocate));
edit_hscrollbar.set_name ("EditorHScrollbar");
build_cursors (); build_cursors ();
setup_toolbar (); setup_toolbar ();
@ -2541,7 +2543,7 @@ Editor::setup_toolbar ()
zoom_out_full_button.add (*(manage (new Image (::get_icon("zoom_full"))))); zoom_out_full_button.add (*(manage (new Image (::get_icon("zoom_full")))));
zoom_out_full_button.signal_clicked().connect (mem_fun(*this, &Editor::temporal_zoom_session)); zoom_out_full_button.signal_clicked().connect (mem_fun(*this, &Editor::temporal_zoom_session));
ARDOUR_UI::instance()->tooltips().set_tip (zoom_out_full_button, _("Zoom to Session")); ARDOUR_UI::instance()->tooltips().set_tip (zoom_out_full_button, _("Zoom to Session"));
zoom_focus_selector.set_name ("ZoomFocusSelector"); zoom_focus_selector.set_name ("ZoomFocusSelector");
Gtkmm2ext::set_size_request_to_display_given_text (zoom_focus_selector, "Edit Cursor", FUDGE, 0); Gtkmm2ext::set_size_request_to_display_given_text (zoom_focus_selector, "Edit Cursor", FUDGE, 0);
set_popdown_strings (zoom_focus_selector, zoom_focus_strings); set_popdown_strings (zoom_focus_selector, zoom_focus_strings);