ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Use non-deprecated form of Gtk::Widget::size_request

Browse Source
This commit is contained in:
Tim Mayberry 2015-02-27 22:47:10 +10:00
parent cf161c2da2
commit 99a81e2a27
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/big_clock_window.cc
View File

@ -48,7 +48,7 @@ BigClockWindow::BigClockWindow (AudioClock& c)
add (clock);
clock.show_all ();
clock.size_request (default_size);
default_size = clock.size_request ();
clock.signal_size_allocate().connect (sigc::mem_fun (*this, &BigClockWindow::clock_size_reallocated));
}

11
gtk2_ardour/editor_canvas.cc
View File

@ -308,16 +308,15 @@ Editor::track_canvas_viewport_size_allocated ()
void
Editor::reset_controls_layout_width ()
{
GtkRequisition req = { 0, 0 };
GtkRequisition req = edit_controls_vbox.size_request ();
gint w;
edit_controls_vbox.size_request (req);
w = req.width;
if (_group_tabs->get_visible()) {
_group_tabs->size_request (req);
w += req.width;
}
if (_group_tabs->get_visible ()) {
req = _group_tabs->size_request ();
w += req.width;
}
/* the controls layout has no horizontal scrolling, its visible
width is always equal to the total width of its contents.

8
gtk2_ardour/gain_meter.cc
View File

@ -1072,15 +1072,13 @@ GainMeter::set_controls (boost::shared_ptr<Route> r,
int
GainMeter::get_gm_width ()
{
Gtk::Requisition sz;
Gtk::Requisition sz = meter_metric_area.size_request ();
int min_w = 0;
sz.width = 0;
meter_metric_area.size_request (sz);
min_w += sz.width;
level_meter->size_request (sz);
sz = level_meter->size_request ();
min_w += sz.width;
fader_alignment.size_request (sz);
sz = fader_alignment.size_request ();
if (_width == Wide)
return max(sz.width * 2, min_w * 2) + 6;
else

3
gtk2_ardour/time_axis_view.cc
View File

@ -150,8 +150,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
{
std::auto_ptr<Gtk::Entry> an_entry (new Gtkmm2ext::FocusEntry);
an_entry->set_name (X_("TrackNameEditor"));
Gtk::Requisition req;
an_entry->size_request (req);
Gtk::Requisition req = an_entry->size_request ();
name_label.set_size_request (-1, req.height);
name_label.set_ellipsize (Pango::ELLIPSIZE_MIDDLE);