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

Merge branch 'master' into ardour-merge

Browse source
This commit is contained in:
Paul Davis 2014-09-02 12:07:20 -04:00
commit f5dbd36066
4 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
gtk2_ardour/icons/grabber_edit_point.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 543 B

After

Width:  |  Height:  |  Size: 3.5 KiB

Before After
Before After

BIN
gtk2_ardour/icons/zoom_in_cursor.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Before After
Before After

BIN
gtk2_ardour/icons/zoom_out_cursor.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Before After
Before After

13
gtk2_ardour/waves_dropdown.cc
View file

@ -52,16 +52,15 @@ WavesDropdown::_on_menu_item (void* cookie)
void void
WavesDropdown::_on_popup_menu_position (int& x, int& y, bool& push_in) WavesDropdown::_on_popup_menu_position (int& x, int& y, bool& push_in)
{ {
Gtk::Container *toplevel = get_toplevel (); if (get_window ()) {
if (toplevel) {
translate_coordinates (*toplevel, 0, 0, x, y);
Gtk::Allocation a = get_allocation (); Gtk::Allocation a = get_allocation ();
x += a.get_x ();
y += a.get_y ();
int xo; int xo;
int yo; int yo;
get_window ()->get_origin (xo, yo); get_window ()->get_origin (xo, yo);
x += xo;
y += yo; x = xo;
y = yo + a.get_height ();
} }
} }