diff options
| -rw-r--r-- | gtk2_ardour/ardour3_ui_dark.rc.in | 13 | ||||
| -rw-r--r-- | gtk2_ardour/mono_panner.cc | 5 | ||||
| -rw-r--r-- | gtk2_ardour/stereo_panner.cc | 7 |
3 files changed, 22 insertions, 3 deletions
diff --git a/gtk2_ardour/ardour3_ui_dark.rc.in b/gtk2_ardour/ardour3_ui_dark.rc.in index cd823fa7ca..bb280ae98a 100644 --- a/gtk2_ardour/ardour3_ui_dark.rc.in +++ b/gtk2_ardour/ardour3_ui_dark.rc.in @@ -292,6 +292,16 @@ style "default" = "medium_text" } } +style "contrasting_popup" = "medium_text" +{ + bg[NORMAL] = @A_lightest + fg[NORMAL] = @A_darkest + base[NORMAL] = @A_lightest + text[NORMAL] = @A_darkest + text[ACTIVE] = @A_darkest + text[SELECTED] = @A_darkest +} + style "base_frame" { fg[NORMAL] = @A_bg @@ -1427,6 +1437,7 @@ style "padded_button" = "default_button" xthickness = 8 } + #--------------------------------------------------------------- class "GtkWidget" style:highest "default" @@ -1812,6 +1823,8 @@ widget "*MidiTracerTextView" style:highest "midi_tracer_textview" widget "*SoloIsolatedLED" style:highest "solo_isolate_led" widget "*SoloSafeLED" style:highest "solo_safe_led" widget "*SoloLEDLabel" style:highest "very_small_text" +widget "*ContrastingPopup" style:highest "contrasting_popup" +widget "*ContrastingPopup*" style:highest "contrasting_popup" widget "*RouteNameEditorEntry" style:highest "text_cell_entry" widget "*RegionNameEditorEntry" style:highest "text_cell_entry" diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc index 52c417a9fd..9627f87106 100644 --- a/gtk2_ardour/mono_panner.cc +++ b/gtk2_ardour/mono_panner.cc @@ -374,6 +374,7 @@ MonoPanner::on_motion_notify_event (GdkEventMotion* ev) if (!drag_data_window) { drag_data_window = new Window (WINDOW_POPUP); + drag_data_window->set_name (X_("ContrastingPopup")); drag_data_window->set_position (WIN_POS_MOUSE); drag_data_window->set_decorated (false); @@ -392,7 +393,9 @@ MonoPanner::on_motion_notify_event (GdkEventMotion* ev) if (!drag_data_window->is_visible ()) { /* move the window a little away from the mouse */ - drag_data_window->move (ev->x_root+30, ev->y_root+30); + int rx, ry; + get_window()->get_origin (rx, ry); + drag_data_window->move (rx, ry+get_height()); drag_data_window->present (); } diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc index 8442b45e67..4889f02343 100644 --- a/gtk2_ardour/stereo_panner.cc +++ b/gtk2_ardour/stereo_panner.cc @@ -483,6 +483,7 @@ StereoPanner::on_motion_notify_event (GdkEventMotion* ev) if (!drag_data_window) { drag_data_window = new Window (WINDOW_POPUP); + drag_data_window->set_name (X_("ContrastingPopup")); drag_data_window->set_position (WIN_POS_MOUSE); drag_data_window->set_decorated (false); @@ -500,8 +501,10 @@ StereoPanner::on_motion_notify_event (GdkEventMotion* ev) } if (!drag_data_window->is_visible ()) { - /* move the window a little away from the mouse */ - drag_data_window->move (ev->x_root+30, ev->y_root+30); + /* move the popup window vertically down from the panner display */ + int rx, ry; + get_window()->get_origin (rx, ry); + drag_data_window->move (rx, ry+get_height()); drag_data_window->present (); } |