From c1973bc4d4ec9d8d18a690359a2d649905e35264 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 18 Nov 2015 21:00:48 +0100 Subject: Refactored Slider. Expanded all event variable names (all was 'e' before). Changed all uievent enums to enum classes. --- plugingui/listboxbasic.cc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'plugingui/listboxbasic.cc') diff --git a/plugingui/listboxbasic.cc b/plugingui/listboxbasic.cc index 4f66046..d1002b6 100644 --- a/plugingui/listboxbasic.cc +++ b/plugingui/listboxbasic.cc @@ -201,13 +201,13 @@ void ListBoxBasic::scrollEvent(ScrollEvent* scrollEvent) void ListBoxBasic::keyEvent(KeyEvent* keyEvent) { - if(keyEvent->direction != KeyEvent::Down) + if(keyEvent->direction != Direction::down) { return; } switch(keyEvent->keycode) { - case KeyEvent::KeyUp: + case Key::up: if(marked == 0) { return; @@ -221,7 +221,7 @@ void ListBoxBasic::keyEvent(KeyEvent* keyEvent) } break; - case KeyEvent::KeyDown: + case Key::down: { // Number of items that can be displayed at a time. int numitems = height() / (font.textHeight() + padding); @@ -240,7 +240,7 @@ void ListBoxBasic::keyEvent(KeyEvent* keyEvent) } break; - case KeyEvent::KeyHome: + case Key::home: marked = 0; if(marked < scroll.value()) { @@ -248,7 +248,7 @@ void ListBoxBasic::keyEvent(KeyEvent* keyEvent) } break; - case KeyEvent::KeyEnd: + case Key::end: { // Number of items that can be displayed at a time. int numitems = height() / (font.textHeight() + padding); @@ -261,7 +261,7 @@ void ListBoxBasic::keyEvent(KeyEvent* keyEvent) } break; - case KeyEvent::KeyCharacter: + case Key::character: if(keyEvent->text == " ") { setSelection(marked); @@ -269,7 +269,7 @@ void ListBoxBasic::keyEvent(KeyEvent* keyEvent) } break; - case KeyEvent::KeyEnter: + case Key::enter: setSelection(marked); selectionNotifier(); break; @@ -288,7 +288,7 @@ void ListBoxBasic::buttonEvent(ButtonEvent* buttonEvent) { if(buttonEvent->y > 0 && buttonEvent->y < btn_size) { - if(buttonEvent->direction == ButtonEvent::Up) + if(buttonEvent->direction == Direction::up) { return; } @@ -299,7 +299,7 @@ void ListBoxBasic::buttonEvent(ButtonEvent* buttonEvent) if(buttonEvent->y > ((int)height() - btn_size) && buttonEvent->y < ((int)height() - 1)) { - if(buttonEvent->direction == ButtonEvent::Up) + if(buttonEvent->direction == Direction::up) { return; } @@ -308,7 +308,7 @@ void ListBoxBasic::buttonEvent(ButtonEvent* buttonEvent) } } - if(buttonEvent->direction == ButtonEvent::Up) + if(buttonEvent->direction == Direction::up) { int skip = scroll.value(); size_t yoffset = padding / 2; @@ -327,7 +327,7 @@ void ListBoxBasic::buttonEvent(ButtonEvent* buttonEvent) repaintEvent(nullptr); } - if(buttonEvent->direction != ButtonEvent::Up) + if(buttonEvent->direction != Direction::up) { int skip = scroll.value(); size_t yoffset = padding / 2; @@ -344,7 +344,7 @@ void ListBoxBasic::buttonEvent(ButtonEvent* buttonEvent) repaintEvent(nullptr); } - if(buttonEvent->doubleclick) + if(buttonEvent->doubleClick) { selectionNotifier(); } -- cgit v1.2.3