summaryrefslogtreecommitdiff
path: root/plugingui
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2013-05-16 19:26:42 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2013-05-16 19:26:42 +0200
commit919586f8d86ceed1f979967a453f4812fc10d80b (patch)
treef2cf0a54b778b64dccdbeb2ef0b90056bbd01211 /plugingui
parentbc7d41279222dbd07f8e6f02f067347d10c69f33 (diff)
parent1dcb87f400b36f773942562db901e134d14ef8ed (diff)
Merge branch 'master' of http://git.drumgizmo.org/drumgizmo
Diffstat (limited to 'plugingui')
-rw-r--r--plugingui/Makefile.am11
-rw-r--r--plugingui/lineedit.cc1
2 files changed, 1 insertions, 11 deletions
diff --git a/plugingui/Makefile.am b/plugingui/Makefile.am
index e705b3b..aee2de6 100644
--- a/plugingui/Makefile.am
+++ b/plugingui/Makefile.am
@@ -51,14 +51,3 @@ EXTRA_DIST = \
verticalline.h \
widget.h \
window.h
-
-################
-# Test Section #
-################
-
-TEST_SOURCE_DEPS = ${EXTRA_DIST}
-TEST_SCRIPT_DIR = $(top_srcdir)/tools
-
-include ${TEST_SCRIPT_DIR}/Makefile.am.test
-
-include Makefile.am.test
diff --git a/plugingui/lineedit.cc b/plugingui/lineedit.cc
index 9308902..16c6dda 100644
--- a/plugingui/lineedit.cc
+++ b/plugingui/lineedit.cc
@@ -94,6 +94,7 @@ void GUI::LineEdit::buttonEvent(ButtonEvent *e)
break;
}
}
+ if(e->x >= (int)(font.textWidth(_text) + BORDER)) pos = _text.length();
repaintEvent(NULL);
}
}