summaryrefslogtreecommitdiff
path: root/plugingui
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2015-10-12 13:22:12 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2015-10-12 13:22:12 +0200
commit151caf049c95368347a6243e85e04a50c87d0e5e (patch)
treeb2e5481c84a13dc593ddc5caef40aac1df208a36 /plugingui
parent4dcddacbe63574c27296d5266554d8d6667367f1 (diff)
Fix missing 'direction' type changes (int to enum).
Diffstat (limited to 'plugingui')
-rw-r--r--plugingui/button.cc4
-rw-r--r--plugingui/checkbox.cc4
-rw-r--r--plugingui/combobox.cc4
-rw-r--r--plugingui/knob.cc6
-rw-r--r--plugingui/lineedit.cc4
-rw-r--r--plugingui/listboxbasic.cc10
-rw-r--r--plugingui/scrollbar.cc8
-rw-r--r--plugingui/slider.cc4
8 files changed, 22 insertions, 22 deletions
diff --git a/plugingui/button.cc b/plugingui/button.cc
index dea376c..be5f82e 100644
--- a/plugingui/button.cc
+++ b/plugingui/button.cc
@@ -83,7 +83,7 @@ Button::~Button()
void Button::buttonEvent(ButtonEvent *e)
{
- if(e->direction == 1)
+ if(e->direction == ButtonEvent::Down)
{
draw_state = down;
button_state = down;
@@ -91,7 +91,7 @@ void Button::buttonEvent(ButtonEvent *e)
repaintEvent(nullptr);
}
- if(e->direction == -1)
+ if(e->direction == ButtonEvent::Up)
{
draw_state = up;
button_state = up;
diff --git a/plugingui/checkbox.cc b/plugingui/checkbox.cc
index 54e0787..c085be9 100644
--- a/plugingui/checkbox.cc
+++ b/plugingui/checkbox.cc
@@ -44,7 +44,7 @@ CheckBox::CheckBox(Widget *parent)
void CheckBox::buttonEvent(ButtonEvent *e)
{
- if(e->direction == -1 || e->doubleclick)
+ if(e->direction == ButtonEvent::Up || e->doubleclick)
{
middle = false;
internalSetChecked(!state);
@@ -67,7 +67,7 @@ void CheckBox::keyEvent(KeyEvent *e)
{
if(e->keycode == KeyEvent::KEY_CHARACTER && e->text == " ")
{
- if(e->direction == -1)
+ if(e->direction == KeyEvent::Up)
{
middle = false;
internalSetChecked(!state);
diff --git a/plugingui/combobox.cc b/plugingui/combobox.cc
index c627b05..cae854a 100644
--- a/plugingui/combobox.cc
+++ b/plugingui/combobox.cc
@@ -166,7 +166,7 @@ void ComboBox::scrollEvent(ScrollEvent *e)
void ComboBox::keyEvent(KeyEvent *e)
{
- if(e->direction != -1)
+ if(e->direction != KeyEvent::Up)
{
return;
}
@@ -226,7 +226,7 @@ void ComboBox::keyEvent(KeyEvent *e)
void ComboBox::buttonEvent(ButtonEvent *e)
{
- if(e->direction != 1)
+ if(e->direction != ButtonEvent::Down)
{
return;
}
diff --git a/plugingui/knob.cc b/plugingui/knob.cc
index 765d401..ec35af0 100644
--- a/plugingui/knob.cc
+++ b/plugingui/knob.cc
@@ -89,7 +89,7 @@ void Knob::mouseMoveEvent(MouseMoveEvent *e)
void Knob::keyEvent(KeyEvent *e)
{
- if(e->direction != -1)
+ if(e->direction != KeyEvent::Up)
{
return;
}
@@ -123,13 +123,13 @@ void Knob::keyEvent(KeyEvent *e)
void Knob::buttonEvent(ButtonEvent *e)
{
- if(e->direction == 1)
+ if(e->direction == ButtonEvent::Down)
{
state = down;
mouse_offset_x = e->x + -1*e->y;
}
- if(e->direction == -1)
+ if(e->direction == ButtonEvent::Up)
{
state = up;
mouse_offset_x = e->x + -1*e->y;
diff --git a/plugingui/lineedit.cc b/plugingui/lineedit.cc
index 5e1eb9b..17d62bb 100644
--- a/plugingui/lineedit.cc
+++ b/plugingui/lineedit.cc
@@ -91,7 +91,7 @@ void GUI::LineEdit::buttonEvent(ButtonEvent *e)
if(readOnly()) return;
- if(e->direction == 1) {
+ if(e->direction == ButtonEvent::Down) {
for(int i = 0; i < (int)_visibletext.length(); i++) {
if(e->x < (int)(font.textWidth(_visibletext.substr(0, i)) + BORDER)) {
pos = i + offsetpos;
@@ -108,7 +108,7 @@ void GUI::LineEdit::keyEvent(GUI::KeyEvent *e)
bool change = false;
- if(e->direction == -1) {
+ if(e->direction == KeyEvent::Up) {
if(e->keycode == GUI::KeyEvent::KEY_LEFT) {
if(pos) pos--;
diff --git a/plugingui/listboxbasic.cc b/plugingui/listboxbasic.cc
index 4e57807..2aae943 100644
--- a/plugingui/listboxbasic.cc
+++ b/plugingui/listboxbasic.cc
@@ -195,7 +195,7 @@ void ListBoxBasic::scrollEvent(ScrollEvent *e)
void ListBoxBasic::keyEvent(KeyEvent *e)
{
- if(e->direction != -1)
+ if(e->direction != KeyEvent::Up)
{
return;
}
@@ -279,7 +279,7 @@ void ListBoxBasic::buttonEvent(ButtonEvent *e)
{
if(e->y > 0 && e->y < btn_size)
{
- if(e->direction == -1)
+ if(e->direction == ButtonEvent::Up)
{
return;
}
@@ -289,7 +289,7 @@ void ListBoxBasic::buttonEvent(ButtonEvent *e)
if(e->y > ((int)height() - btn_size) && e->y < ((int)height() - 1))
{
- if(e->direction == -1)
+ if(e->direction == ButtonEvent::Up)
{
return;
}
@@ -298,7 +298,7 @@ void ListBoxBasic::buttonEvent(ButtonEvent *e)
}
}
- if(e->direction == -1)
+ if(e->direction == ButtonEvent::Up)
{
int skip = scroll.value();
size_t yoffset = padding / 2;
@@ -317,7 +317,7 @@ void ListBoxBasic::buttonEvent(ButtonEvent *e)
repaintEvent(nullptr);
}
- if(e->direction != -1)
+ if(e->direction != ButtonEvent::Up)
{
int skip = scroll.value();
size_t yoffset = padding / 2;
diff --git a/plugingui/scrollbar.cc b/plugingui/scrollbar.cc
index 07dc36b..0b10972 100644
--- a/plugingui/scrollbar.cc
+++ b/plugingui/scrollbar.cc
@@ -150,21 +150,21 @@ void GUI::ScrollBar::mouseMoveEvent(MouseMoveEvent *e)
void GUI::ScrollBar::buttonEvent(ButtonEvent *e)
{
if(e->y < (int)width() && e->y > 0) {
- if(e->direction == -1) setValue(value() - 1);
+ if(e->direction == ButtonEvent::Up) setValue(value() - 1);
return;
}
if(e->y > (int)height() - (int)width() && e->y < (int)height()) {
- if(e->direction == -1) setValue(value() + 1);
+ if(e->direction == ButtonEvent::Up) setValue(value() + 1);
return;
}
- if(e->direction == 1) {
+ if(e->direction == ButtonEvent::Down) {
yoffset = e->y;
value_offset = value();
}
- dragging = (e->direction == 1);
+ dragging = (e->direction == ButtonEvent::Down);
}
#ifdef TEST_SCROLLBAR
diff --git a/plugingui/slider.cc b/plugingui/slider.cc
index 953c8e6..311497a 100644
--- a/plugingui/slider.cc
+++ b/plugingui/slider.cc
@@ -77,7 +77,7 @@ void GUI::Slider::mouseMoveEvent(MouseMoveEvent *e)
void GUI::Slider::buttonEvent(ButtonEvent *e)
{
- if(e->direction == 1) {
+ if(e->direction == ButtonEvent::Down) {
state = down;
val = maximum / (float)width() * (float)e->x;
@@ -87,7 +87,7 @@ void GUI::Slider::buttonEvent(ButtonEvent *e)
if(handler) handler(ptr);
repaintEvent(NULL);
}
- if(e->direction == -1) {
+ if(e->direction == ButtonEvent::Up) {
state = up;
val = maximum / (float)width() * (float)e->x;