summaryrefslogtreecommitdiff
diff options
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2012-07-19 02:00:43 +0200
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2012-07-19 02:00:43 +0200
commitcea8cf4404497befb4ef020b7dbeb5ed0000f0a8 (patch)
tree59635c6ddc6e89713d79fb5a2305cb84120291bb
parent6bc16cf50476860b5a4df8b538759770f5cd30f4 (diff)
LauncherOptions: add edge_passed_disabled_time option
(bzr r2509.1.12)
-rw-r--r--launcher/LauncherOptions.cpp33
-rw-r--r--launcher/LauncherOptions.h1
2 files changed, 18 insertions, 16 deletions
diff --git a/launcher/LauncherOptions.cpp b/launcher/LauncherOptions.cpp
index 934552794..58b29d36d 100644
--- a/launcher/LauncherOptions.cpp
+++ b/launcher/LauncherOptions.cpp
@@ -41,26 +41,27 @@ Options::Options()
, edge_stop_velocity(6500)
, edge_reveal_pressure(2000)
, edge_responsiveness(2.0f)
+ , edge_passed_disabled_ms(1000)
, edge_resist(true)
, show_for_all(false)
{
- auto_hide_animation.changed.connect ([&] (AutoHideAnimation value)-> void { option_changed.emit(); });
- background_alpha.changed.connect ([&] (float value) -> void { option_changed.emit(); });
- backlight_mode.changed.connect ([&] (BacklightMode value) -> void { option_changed.emit(); });
- edge_decay_rate.changed.connect ([&] (int value) -> void { option_changed.emit(); });
- edge_overcome_pressure.changed.connect([&] (int value) -> void { option_changed.emit(); });
- edge_responsiveness.changed.connect ([&] (float value) -> void { option_changed.emit(); });
- edge_reveal_pressure.changed.connect ([&] (int value) -> void { option_changed.emit(); });
- edge_stop_velocity.changed.connect ([&] (int value) -> void { option_changed.emit(); });
- hide_mode.changed.connect ([&] (LauncherHideMode value) -> void { option_changed.emit(); });
- icon_size.changed.connect ([&] (int value) -> void { option_changed.emit(); });
- launch_animation.changed.connect ([&] (LaunchAnimation value) -> void { option_changed.emit(); });
- reveal_trigger.changed.connect ([&] (RevealTrigger vallue) -> void { option_changed.emit(); });
- tile_size.changed.connect ([&] (int value) -> void { option_changed.emit(); });
- urgent_animation.changed.connect ([&] (UrgentAnimation value) -> void { option_changed.emit(); });
- edge_resist.changed.connect ([&] (bool value) -> void { option_changed.emit(); });
+ auto_hide_animation.changed.connect ([this] (AutoHideAnimation value) { option_changed.emit(); });
+ background_alpha.changed.connect ([this] (float value) { option_changed.emit(); });
+ backlight_mode.changed.connect ([this] (BacklightMode value) { option_changed.emit(); });
+ edge_decay_rate.changed.connect ([this] (int value) { option_changed.emit(); });
+ edge_overcome_pressure.changed.connect ([this] (int value) { option_changed.emit(); });
+ edge_responsiveness.changed.connect ([this] (float value) { option_changed.emit(); });
+ edge_reveal_pressure.changed.connect ([this] (int value) { option_changed.emit(); });
+ edge_stop_velocity.changed.connect ([this] (int value) { option_changed.emit(); });
+ edge_passed_disabled_ms.changed.connect([this] (unsigned value) { option_changed.emit(); });
+ hide_mode.changed.connect ([this] (LauncherHideMode value) { option_changed.emit(); });
+ icon_size.changed.connect ([this] (int value) { option_changed.emit(); });
+ launch_animation.changed.connect ([this] (LaunchAnimation value) { option_changed.emit(); });
+ reveal_trigger.changed.connect ([this] (RevealTrigger vallue) { option_changed.emit(); });
+ tile_size.changed.connect ([this] (int value) { option_changed.emit(); });
+ urgent_animation.changed.connect ([this] (UrgentAnimation value) { option_changed.emit(); });
+ edge_resist.changed.connect ([this] (bool value) { option_changed.emit(); });
}
-
}
}
diff --git a/launcher/LauncherOptions.h b/launcher/LauncherOptions.h
index 5a02b5fb9..0a29a5bb6 100644
--- a/launcher/LauncherOptions.h
+++ b/launcher/LauncherOptions.h
@@ -97,6 +97,7 @@ public:
nux::Property<int> edge_stop_velocity;
nux::Property<int> edge_reveal_pressure;
nux::Property<float> edge_responsiveness;
+ nux::Property<unsigned> edge_passed_disabled_ms;
nux::Property<bool> edge_resist;
nux::Property<bool> show_for_all;