summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--menuitem.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/menuitem.c b/menuitem.c
index 212b996..91b7f2e 100644
--- a/menuitem.c
+++ b/menuitem.c
@@ -244,10 +244,10 @@ void cNopacityMainMenuItem::Render() {
drawn = true;
}
SetTextShort();
- if (current && scrollable && config.menuScrollSpeed) {
+ if (current && scrollable && !Running() && config.menuScrollSpeed) {
Start();
}
- if (wasCurrent && scrollable && Running()) {
+ if (wasCurrent && !current && scrollable && Running()) {
pixmapTextScroller->SetDrawPortPoint(cPoint(0, 0));
SetTextShort();
Cancel(-1);
@@ -476,10 +476,10 @@ void cNopacityScheduleMenuItem::Render() {
SetTextShort();
drawn = true;
}
- if (current && scrollable && config.menuScrollSpeed) {
+ if (current && scrollable && !Running() && config.menuScrollSpeed) {
Start();
}
- if (wasCurrent && scrollable && Running()) {
+ if (wasCurrent && !current && scrollable && Running()) {
pixmapTextScroller->SetDrawPortPoint(cPoint(0, 0));
SetTextShort();
Cancel(-1);
@@ -592,10 +592,10 @@ void cNopacityChannelMenuItem::Render() {
drawn = true;
}
SetTextShort();
- if (current && scrollable && config.menuScrollSpeed) {
+ if (current && scrollable && !Running() && config.menuScrollSpeed) {
Start();
}
- if (wasCurrent && scrollable && Running()) {
+ if (wasCurrent && !current && scrollable && Running()) {
pixmapTextScroller->SetDrawPortPoint(cPoint(0, 0));
SetTextShort();
Cancel(-1);
@@ -680,10 +680,10 @@ void cNopacityDefaultMenuItem::Render() {
} else
break;
}
- if (current && scrollable && !Running() && config.menuScrollSpeed) {
+ if (current && scrollable && !Running() && config.menuScrollSpeed) {
Start();
}
- if (wasCurrent && (current != wasCurrent) && scrollable && Running()) {
+ if (wasCurrent && !current && scrollable && Running()) {
pixmapTextScroller->SetDrawPortPoint(cPoint(0, 0));
SetTextShort();
Cancel(-1);