smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-26 16:37:44 +01:00
Code Issues Projects Releases Wiki Activity

Fix some off by one or more errors spotted by The Big Programmer. Fewer forced updates during vertical scroll on quartz.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3710 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Nick Mainsbridge 2008-09-08 19:36:41 +00:00
parent 431bf67aca
commit 665b26cdf3
4 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gtk2_ardour/editor.cc
View file

@ -458,9 +458,7 @@ Editor::Editor ()
ruler_label_event_box.set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
ruler_label_event_box.set_name ("TimebarLabelBase");
ruler_label_event_box.signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_label_button_release));
ruler_label_frame.add(ruler_label_event_box);
ruler_label_frame.property_shadow_type() = Gtk::SHADOW_OUT;
time_button_vbox.pack_start (meter_label, false, false);
time_button_vbox.pack_start (tempo_label, false, false);
time_button_vbox.pack_start (mark_label, false, false);
@ -471,9 +469,6 @@ Editor::Editor ()
time_button_event_box.set_name ("TimebarLabelBase");
time_button_event_box.signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_label_button_release));
time_button_frame.add(time_button_event_box);
time_button_frame.property_shadow_type() = Gtk::SHADOW_OUT;
/* these enable us to have a dedicated window (for cursor setting, etc.)
for the canvas areas.
*/
@ -491,8 +486,8 @@ Editor::Editor ()
edit_packer.attach (edit_vscrollbar, 0, 1, 0, 4, FILL, FILL|EXPAND, 0, 0);
edit_packer.attach (ruler_label_frame, 1, 2, 0, 1, FILL, SHRINK, 0, 0);
edit_packer.attach (time_button_frame, 1, 2, 1, 2, FILL, FILL, 0, 0);
edit_packer.attach (ruler_label_event_box, 1, 2, 0, 1, FILL, SHRINK, 0, 0);
edit_packer.attach (time_button_event_box, 1, 2, 1, 2, FILL, SHRINK, 0, 0);
edit_packer.attach (time_canvas_event_box, 2, 3, 0, 1, FILL|EXPAND, FILL, 0, 0);
edit_packer.attach (controls_layout, 1, 2, 2, 3, FILL, FILL|EXPAND, 0, 0);

2
gtk2_ardour/editor.h
View file

@ -595,8 +595,6 @@ class Editor : public PublicEditor
Gtk::EventBox track_canvas_event_box;
Gtk::EventBox time_button_event_box;
Gtk::EventBox ruler_label_event_box;
Gtk::Frame time_button_frame;
Gtk::Frame ruler_label_frame;
ArdourCanvas::Pixbuf* logo_item;
ArdourCanvas::Group* minsec_group;

8
gtk2_ardour/editor_canvas.cc
View file

@ -405,8 +405,7 @@ Editor::controls_layout_size_request (Requisition* req)
controls_layout.set_size (edit_controls_vbox.get_width(), (gint) pos);
controls_layout.set_size_request(edit_controls_vbox.get_width(), -1);
zoom_box.set_size_request(edit_controls_vbox.get_width(), -1);
//time_button_frame.set_size_request(edit_controls_vbox.get_width() + edit_vscrollbar.get_width(), -1);
time_button_frame.set_size_request(edit_controls_vbox.get_width(), -1);
time_button_event_box.set_size_request(edit_controls_vbox.get_width(), -1);
if ((vertical_adjustment.get_value() + canvas_height) >= vertical_adjustment.get_upper()) {
/*
@ -874,9 +873,10 @@ Editor::scroll_canvas_vertically ()
_trackview_group->move (0, -y_delta);
_region_motion_group->move (0, -y_delta);
/* required to keep the controls_layout in sync with the canvas group */
#ifndef GTKOSX
/* required to keep the controls_layout in lock step with the canvas group */
track_canvas->update_now ();
#endif
}
void

10
gtk2_ardour/editor_rulers.cc
View file

@ -651,8 +651,8 @@ Editor::update_ruler_visibility ()
visible_rulers++;
}
double tbpos = 1.0;
double tbgpos = 1.0;
double tbpos = 0.0;
double tbgpos = 0.0;
double old_unit_pos;
if (ruler_meter_action->get_active()) {
@ -781,7 +781,7 @@ Editor::update_ruler_visibility ()
}
gdouble old_canvas_timebars_vsize = canvas_timebars_vsize;
canvas_timebars_vsize = (timebar_height * visible_timebars) + 2.0;
canvas_timebars_vsize = timebar_height * visible_timebars;
gdouble vertical_pos_delta = canvas_timebars_vsize - old_canvas_timebars_vsize;
if (vertical_pos_delta < 0 && (vertical_adjustment.get_value() + canvas_height) >= vertical_adjustment.get_upper()) {
@ -800,8 +800,8 @@ Editor::update_ruler_visibility ()
redisplay_tempo (false);
time_canvas_event_box.show_all();
ruler_label_frame.show_all();
time_button_frame.show_all();
ruler_label_event_box.show_all();
time_button_event_box.show_all();
}
void