Skip to content

Commit 9b8fa99

Browse files
adelcoding1nerzhul
adelcoding1
authored and
nerzhul
committedOct 9, 2017
FormSpec : Add an auto vertical scrollbar to the textarea
·
5.11.05.0.0
1 parent c830347 commit 9b8fa99

8 files changed

+1856
-34
lines changed
 

‎build/android/jni/Android.mk

+1
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ LOCAL_SRC_FILES := \
149149
jni/src/genericobject.cpp \
150150
jni/src/gettext.cpp \
151151
jni/src/guiChatConsole.cpp \
152+
jni/src/guiEditBoxWithScrollbar.cpp \
152153
jni/src/guiEngine.cpp \
153154
jni/src/guiPathSelectMenu.cpp \
154155
jni/src/guiFormSpecMenu.cpp \

‎doc/lua_api.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1918,8 +1918,9 @@ examples.
19181918
* if <close_on_enter> is false, pressing enter in the field will submit the form but not close it
19191919
* defaults to true when not specified (ie: no tag for a field)
19201920

1921-
#### `textarea[<X>,<Y>;<W>,<H>;<name>;<label>;<default>]`
1921+
#### `textarea[<X>,<Y>;<W>,<H>;<name>;<label>;<default>;<scrollbar>]`
19221922
* Same as fields above, but with multi-line input
1923+
* if <scrollbar> is true an auto vertical scrollbar is added
19231924

19241925
#### `label[<X>,<Y>;<label>]`
19251926
* `x` and `y` work as per field

‎src/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,7 @@ set(client_SRCS
511511
fontengine.cpp
512512
game.cpp
513513
guiChatConsole.cpp
514+
guiEditBoxWithScrollbar.cpp
514515
guiEngine.cpp
515516
guiPathSelectMenu.cpp
516517
guiFormSpecMenu.cpp

1 commit comments

Comments
 (1)

paramat commented on Oct 9, 2017

@paramat
paramat
on Oct 9, 2017
Contributor

@adelcoding1 Warnings during build:

src/guiEditBoxWithScrollbar.cpp:1436:32: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
if (getTextDimension().Height > m_frame_rect.getHeight()) {

src/intlGUIEditBox.cpp:1520:32: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
if (getTextDimension().Height > FrameRect.getHeight()) {

Please sign in to comment.