smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 23:35:03 +01:00
Code Issues Projects Releases Wiki Activity

fix meter bridge window size issues

Browse source 
* no more OSX liveloop (window size < min size)
* properly set min window size
* re-layout metric areas when label height changes
* remove ‘smart’ auto-resize (when tracks are added/removed)
  (it wasn’t smart enough to work on all WMs)
This commit is contained in:
Robin Gareus 2015-01-07 22:07:23 +01:00
parent a4f7c21ec3
commit 0a4038f1df
2 changed files with 42 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

35
gtk2_ardour/meter_strip.cc
View file

@ -536,13 +536,40 @@ MeterStrip::on_size_allocate (Gtk::Allocation& a)
// NB numbers are rotated 90deg. on the meterbridge // NB numbers are rotated 90deg. on the meterbridge
tnh = 4 + std::max(2u, _session->track_number_decimals()) * 8; // TODO 8 = max_with_of_digit_0_to_9() tnh = 4 + std::max(2u, _session->track_number_decimals()) * 8; // TODO 8 = max_with_of_digit_0_to_9()
} }
int prev_height, ignored;
bool need_relayout = false;
namebx.get_size_request(ignored, prev_height);
namebx.set_size_request(18, nh + tnh); namebx.set_size_request(18, nh + tnh);
namenumberbx.set_size_request(18, nh + tnh);
if (_route) { if (prev_height != nh + tnh) {
name_label.set_size_request(18, nh + (_route->is_master() ? tnh : -1)); need_relayout = true;
name_label.set_layout_ellisize_width ((nh - 4 + (_route->is_master() ? tnh : 0)) * PANGO_SCALE);
} }
namenumberbx.get_size_request(ignored, prev_height);
namenumberbx.set_size_request(18, nh + tnh);
if (prev_height != nh + tnh) {
need_relayout = true;
}
if (_route) {
int nlh = nh + (_route->is_master() ? tnh : -1);
name_label.get_size_request(ignored, prev_height);
name_label.set_size_request(18, nlh);
name_label.set_layout_ellisize_width ((nh - 4 + (_route->is_master() ? tnh : 0)) * PANGO_SCALE);
if (prev_height != nlh) {
need_relayout = true;
}
}
VBox::on_size_allocate(a); VBox::on_size_allocate(a);
if (need_relayout) {
queue_resize();
MetricChanged(); // force re-layout, parent on_scroll(), queue_resize()
}
} }
gint gint

33
gtk2_ardour/meterbridge.cc
View file

@ -104,9 +104,12 @@ Meterbridge::Meterbridge ()
Gdk::Geometry geom; Gdk::Geometry geom;
geom.max_width = 1<<16; geom.max_width = 1<<16;
geom.max_height = max_height; geom.max_height = max_height;
geom.min_width = 40;
geom.min_height = -1;
geom.height_inc = 16; geom.height_inc = 16;
geom.width_inc = 1; geom.width_inc = 1;
set_geometry_hints(*((Gtk::Window*) this), geom, Gdk::HINT_MAX_SIZE | Gdk::HINT_RESIZE_INC); assert(max_height % 16 == 0);
set_geometry_hints(*((Gtk::Window*) this), geom, Gdk::HINT_MIN_SIZE | Gdk::HINT_MAX_SIZE | Gdk::HINT_RESIZE_INC);
set_keep_above (true); set_keep_above (true);
set_border_width (0); set_border_width (0);
@ -325,33 +328,18 @@ Meterbridge::on_size_request (Gtk::Requisition* r)
Gtk::Requisition mr = meterarea.size_request(); Gtk::Requisition mr = meterarea.size_request();
geom.max_width = mr.width + metrics_left.get_width() + metrics_right.get_width(); geom.max_width = mr.width + metrics_left.get_width() + metrics_right.get_width();
geom.max_width = std::max(50, geom.max_width);
geom.max_height = max_height; geom.max_height = max_height;
#ifndef GTKOSX
/* on OSX this leads to a constant live-loop: show/hide scrollbar
* on Linux, the window is resized IFF the scrollbar was not visible
*/
const Gtk::Scrollbar * hsc = scroller.get_hscrollbar();
Glib::RefPtr<Gdk::Screen> screen = get_screen ();
Gdk::Rectangle monitor_rect;
screen->get_monitor_geometry (0, monitor_rect);
const int scr_w = monitor_rect.get_width() - 44;
if (cur_max_width < geom.max_width
&& cur_max_width < scr_w
&& !(scroller.get_hscrollbar_visible() && hsc)) {
int h = r->height;
*r = Gtk::Requisition();
r->width = geom.max_width;
r->height = h;
}
#endif
if (cur_max_width != geom.max_width) { if (cur_max_width != geom.max_width) {
cur_max_width = geom.max_width; cur_max_width = geom.max_width;
/* height resizes are 'heavy' since the metric areas and meter-patterns
* are re-generated. limit to 16px steps. */
geom.height_inc = 16; geom.height_inc = 16;
geom.width_inc = 1; geom.width_inc = 1;
set_geometry_hints(*((Gtk::Window*) this), geom, Gdk::HINT_MAX_SIZE | Gdk::HINT_RESIZE_INC); geom.min_width = 40;
geom.min_height = -1;
set_geometry_hints(*((Gtk::Window*) this), geom, Gdk::HINT_MIN_SIZE | Gdk::HINT_MAX_SIZE | Gdk::HINT_RESIZE_INC);
} }
} }
@ -360,6 +348,7 @@ Meterbridge::on_size_allocate (Gtk::Allocation& a)
{ {
const Gtk::Scrollbar * hsc = scroller.get_hscrollbar(); const Gtk::Scrollbar * hsc = scroller.get_hscrollbar();
/* switch left/right edge patterns depending on horizontal scroll-position */
if (scroller.get_hscrollbar_visible() && hsc) { if (scroller.get_hscrollbar_visible() && hsc) {
if (!scroll_connection.connected()) { if (!scroll_connection.connected()) {
scroll_connection = scroller.get_hscrollbar()->get_adjustment()->signal_value_changed().connect(sigc::mem_fun (*this, &Meterbridge::on_scroll)); scroll_connection = scroller.get_hscrollbar()->get_adjustment()->signal_value_changed().connect(sigc::mem_fun (*this, &Meterbridge::on_scroll));