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

provide global prelight option (its in Edit -> Preferences->Interface)

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10514 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-11-09 20:10:05 +00:00
parent 9d56b190ad
commit 244eaa55fb
7 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/ardour3_widget_list.rc
View file

@ -392,4 +392,4 @@ widget "*MonitorSectionLabel" style:highest "very_small_text"
widget "*mute button" style:highest "small_text" widget "*mute button" style:highest "small_text"
widget "*send alert button" style:highest "small_text" widget "*send alert button" style:highest "small_text"
widget "*solo button" style:highest "small_text" widget "*solo button" style:highest "small_text"
widget "*transport option button" style:highest "small_text" widget "*transport option button" style:highest "very_small_text"

8
gtk2_ardour/ardour_button.cc
View file

@ -30,6 +30,8 @@
#include "gtkmm2ext/rgb_macros.h" #include "gtkmm2ext/rgb_macros.h"
#include "gtkmm2ext/gui_thread.h" #include "gtkmm2ext/gui_thread.h"
#include "ardour/rc_configuration.h" // for widget prelight preference
#include "ardour_button.h" #include "ardour_button.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "global_signals.h" #include "global_signals.h"
@ -246,7 +248,7 @@ ArdourButton::render (cairo_t* cr)
/* if requested, show hovering */ /* if requested, show hovering */
if ((_tweaks & ShowHover)) { if (ARDOUR::Config->get_widget_prelight()) {
if (_hovering) { if (_hovering) {
Gtkmm2ext::rounded_rectangle (cr, 0, 0, _width, _height, _corner_radius); Gtkmm2ext::rounded_rectangle (cr, 0, 0, _width, _height, _corner_radius);
cairo_set_source_rgba (cr, 0.905, 0.917, 0.925, 0.2); cairo_set_source_rgba (cr, 0.905, 0.917, 0.925, 0.2);
@ -634,7 +636,7 @@ ArdourButton::on_enter_notify_event (GdkEventCrossing* ev)
{ {
_hovering = true; _hovering = true;
if (_tweaks & ShowHover) { if (ARDOUR::Config->get_widget_prelight()) {
queue_draw (); queue_draw ();
} }
@ -646,7 +648,7 @@ ArdourButton::on_leave_notify_event (GdkEventCrossing* ev)
{ {
_hovering = false; _hovering = false;
if (_tweaks & ShowHover) { if (ARDOUR::Config->get_widget_prelight()) {
queue_draw (); queue_draw ();
} }

1
gtk2_ardour/ardour_button.h
View file

@ -50,7 +50,6 @@ class ArdourButton : public CairoWidget
enum Tweaks { enum Tweaks {
ShowClick = 0x1, ShowClick = 0x1,
ShowHover = 0x2,
NoModel = 0x4, NoModel = 0x4,
}; };

11
gtk2_ardour/ardour_ui.cc
View file

@ -237,15 +237,8 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
rec_button.set_name ("transport recenable button"); rec_button.set_name ("transport recenable button");
join_play_range_button.set_name ("transport button"); join_play_range_button.set_name ("transport button");
roll_button.set_tweaks (ArdourButton::ShowHover); goto_start_button.set_tweaks (ArdourButton::ShowClick);
stop_button.set_tweaks (ArdourButton::ShowHover); goto_end_button.set_tweaks (ArdourButton::ShowClick);
auto_loop_button.set_tweaks (ArdourButton::ShowHover);
play_selection_button.set_tweaks (ArdourButton::ShowHover);
rec_button.set_tweaks (ArdourButton::ShowHover);
join_play_range_button.set_tweaks (ArdourButton::ShowHover);
goto_start_button.set_tweaks (ArdourButton::Tweaks(ArdourButton::ShowClick|ArdourButton::ShowHover));
goto_end_button.set_tweaks (ArdourButton::Tweaks(ArdourButton::ShowClick|ArdourButton::ShowHover));
last_configure_time= 0; last_configure_time= 0;
last_peak_grab = 0; last_peak_grab = 0;

8
gtk2_ardour/rc_option_editor.cc
View file

@ -1493,6 +1493,14 @@ RCOptionEditor::RCOptionEditor ()
/* INTERFACE */ /* INTERFACE */
add_option (_("Interface"),
new BoolOption (
"widget_prelight",
_("Graphically indicate mouse pointer hovering over various widgets"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_widget_prelight),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_widget_prelight)
));
#ifndef GTKOSX #ifndef GTKOSX
/* font scaling does nothing with GDK/Quartz */ /* font scaling does nothing with GDK/Quartz */
add_option (_("Interface"), new FontScalingOptions (_rc_config)); add_option (_("Interface"), new FontScalingOptions (_rc_config));

1
libs/ardour/ardour/rc_configuration_vars.h
View file

@ -177,4 +177,5 @@ CONFIG_VARIABLE (DenormalModel, denormal_model, "denormal-model", DenormalNone)
/* visibility of various things */ /* visibility of various things */
CONFIG_VARIABLE (bool, show_zoom_tools, "show-zoom-tools", true) CONFIG_VARIABLE (bool, show_zoom_tools, "show-zoom-tools", true)
CONFIG_VARIABLE (bool, widget_prelight, "widget-prelight", true)
CONFIG_VARIABLE (std::string, mixer_strip_visibility, "mixer-strip-visibility", "PhaseInvert,SoloSafe,SoloIsolated,Group,MeterPoint") CONFIG_VARIABLE (std::string, mixer_strip_visibility, "mixer-strip-visibility", "PhaseInvert,SoloSafe,SoloIsolated,Group,MeterPoint")

2
tools/fmt-bindings
View file

@ -18,7 +18,7 @@ $group_number = 0;
%merge_bindings; %merge_bindings;
$platform = linux; $platform = linux;
$winkey = 'Mod4><Super'; $winkey = 'Mod4\>\<Super';
$make_cheatsheet = 1; $make_cheatsheet = 1;
$make_accelmap = 0; $make_accelmap = 0;
$merge_from = ""; $merge_from = "";