Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
illuna-minetest
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Illuna-Minetest
illuna-minetest
Commits
46d431e7
Commit
46d431e7
authored
12 years ago
by
Jeija
Committed by
PilzAdam
12 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Implement textarea in formspec, a multiline input field
parent
615fd498
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
doc/lua_api.txt
+3
-0
3 additions, 0 deletions
doc/lua_api.txt
src/guiFormSpecMenu.cpp
+47
-33
47 additions, 33 deletions
src/guiFormSpecMenu.cpp
with
50 additions
and
33 deletions
doc/lua_api.txt
+
3
−
0
View file @
46d431e7
...
...
@@ -725,6 +725,9 @@ field[<name>;<label>;<default>]
^ must be used without a size[] element
^ a 'Proceed' button will be added automatically
textarea[<X>,<Y>;<W>,<H>;<name>;<label>;<default>]
^ same as fields above, but with multi-line input
label[<X>,<Y>;<label>]
^ x and y work as per field
^ label is the text on the label
...
...
This diff is collapsed.
Click to expand it.
src/guiFormSpecMenu.cpp
+
47
−
33
View file @
46d431e7
...
...
@@ -318,13 +318,16 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
errorstream
<<
"WARNING: invalid use of background without a size[] element"
<<
std
::
endl
;
m_backgrounds
.
push_back
(
ImageDrawSpec
(
name
,
pos
,
geom
));
}
else
if
(
type
==
"field"
)
else
if
(
type
==
"field"
or
type
==
"textarea"
)
{
std
::
string
fname
=
f
.
next
(
";"
);
std
::
string
flabel
=
f
.
next
(
";"
);
if
(
fname
.
find
(
","
)
==
std
::
string
::
npos
&&
flabel
.
find
(
","
)
==
std
::
string
::
npos
)
{
if
(
type
==
"textarea"
)
errorstream
<<
"WARNING: Textarea connot be unpositioned"
<<
std
::
endl
;
if
(
!
bp_set
)
{
rect
=
core
::
rect
<
s32
>
(
...
...
@@ -339,7 +342,7 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
bp_set
=
1
;
}
else
if
(
bp_set
==
2
)
errorstream
<<
"WARNING: invalid use of unpositioned
field
in inventory"
<<
std
::
endl
;
errorstream
<<
"WARNING: invalid use of unpositioned
"
<<
type
<<
"
in inventory"
<<
std
::
endl
;
v2s32
pos
=
basepos
;
pos
.
Y
=
((
m_fields
.
size
()
+
2
)
*
60
);
...
...
@@ -353,20 +356,32 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
pos
.
Y
=
stof
(
fname
.
substr
(
fname
.
find
(
","
)
+
1
))
*
(
float
)
spacing
.
Y
;
v2s32
geom
;
geom
.
X
=
(
stof
(
flabel
.
substr
(
0
,
flabel
.
find
(
","
)))
*
(
float
)
spacing
.
X
)
-
(
spacing
.
X
-
imgsize
.
X
);
pos
.
Y
+=
(
stof
(
flabel
.
substr
(
flabel
.
find
(
","
)
+
1
))
*
(
float
)
imgsize
.
Y
)
/
2
;
if
(
type
==
"textarea"
)
{
geom
.
Y
=
(
stof
(
flabel
.
substr
(
flabel
.
find
(
","
)
+
1
))
*
(
float
)
imgsize
.
Y
)
-
(
spacing
.
Y
-
imgsize
.
Y
);
pos
.
Y
+=
15
;
}
else
{
pos
.
Y
+=
(
stof
(
flabel
.
substr
(
flabel
.
find
(
","
)
+
1
))
*
(
float
)
imgsize
.
Y
)
/
2
;
pos
.
Y
-=
15
;
geom
.
Y
=
30
;
}
rect
=
core
::
rect
<
s32
>
(
pos
.
X
,
pos
.
Y
,
pos
.
X
+
geom
.
X
,
pos
.
Y
+
geom
.
Y
);
rect
=
core
::
rect
<
s32
>
(
pos
.
X
,
pos
.
Y
-
15
,
pos
.
X
+
geom
.
X
,
pos
.
Y
+
15
);
fname
=
f
.
next
(
";"
);
flabel
=
f
.
next
(
";"
);
if
(
bp_set
!=
2
)
errorstream
<<
"WARNING: invalid use of positioned
field
without a size[] element"
<<
std
::
endl
;
errorstream
<<
"WARNING: invalid use of positioned
"
<<
type
<<
"
without a size[] element"
<<
std
::
endl
;
}
std
::
string
odefault
=
f
.
next
(
"]"
);
std
::
string
fdefault
;
// fdefault may contain a variable reference, which
// needs to be resolved from the node metadata
if
(
m_form_src
)
...
...
@@ -380,41 +395,40 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
narrow_to_wide
(
fdefault
.
c_str
()),
258
+
m_fields
.
size
()
);
// three cases: field and no label, label and no field, label and field
if
(
flabel
==
""
)
{
spec
.
send
=
true
;
gui
::
IGUIElement
*
e
=
Environment
->
addEditBox
(
spec
.
fdefault
.
c_str
(),
rect
,
true
,
this
,
spec
.
fid
);
Environment
->
setFocus
(
e
);
irr
::
SEvent
evt
;
evt
.
EventType
=
EET_KEY_INPUT_EVENT
;
evt
.
KeyInput
.
Key
=
KEY_END
;
evt
.
KeyInput
.
PressedDown
=
true
;
e
->
OnEvent
(
evt
);
}
else
if
(
fname
==
""
)
// three cases: field name and no label, label and field, label name and no field
gui
::
IGUIEditBox
*
e
;
if
(
fname
==
""
)
{
//
set
spec field id to 0, this stops submit searching for a value that isn't there
// spec field id to 0, this stops submit searching for a value that isn't there
Environment
->
addStaticText
(
spec
.
flabel
.
c_str
(),
rect
,
false
,
true
,
this
,
spec
.
fid
);
}
else
{
spec
.
send
=
true
;
gui
::
IGUIElement
*
e
=
Environment
->
addEditBox
(
spec
.
fdefault
.
c_str
(),
rect
,
true
,
this
,
spec
.
fid
);
e
=
Environment
->
addEditBox
(
spec
.
fdefault
.
c_str
(),
rect
,
true
,
this
,
spec
.
fid
);
Environment
->
setFocus
(
e
);
rect
.
UpperLeftCorner
.
Y
-=
15
;
rect
.
LowerRightCorner
.
Y
-=
15
;
Environment
->
addStaticText
(
spec
.
flabel
.
c_str
(),
rect
,
false
,
true
,
this
,
0
);
irr
::
SEvent
evt
;
evt
.
EventType
=
EET_KEY_INPUT_EVENT
;
evt
.
KeyInput
.
Key
=
KEY_END
;
evt
.
KeyInput
.
PressedDown
=
true
;
e
->
OnEvent
(
evt
);
if
(
type
==
"textarea"
)
{
e
->
setMultiLine
(
true
);
e
->
setTextAlignment
(
gui
::
EGUIA_UPPERLEFT
,
gui
::
EGUIA_UPPERLEFT
);
}
else
{
irr
::
SEvent
evt
;
evt
.
KeyInput
.
Key
=
KEY_END
;
evt
.
EventType
=
EET_KEY_INPUT_EVENT
;
evt
.
KeyInput
.
PressedDown
=
true
;
e
->
OnEvent
(
evt
);
}
if
(
flabel
!=
""
)
{
rect
.
UpperLeftCorner
.
Y
-=
15
;
rect
.
LowerRightCorner
.
Y
=
rect
.
UpperLeftCorner
.
Y
+
15
;
Environment
->
addStaticText
(
spec
.
flabel
.
c_str
(),
rect
,
false
,
true
,
this
,
0
);
}
}
m_fields
.
push_back
(
spec
);
}
else
if
(
type
==
"label"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment