Moves the chatbar to the output window + adds missing tgui styles (#1366)

* i hate this

* Merge branch 'master' into bars

* weh
This commit is contained in:
Azarak
2020-10-19 18:51:14 +01:00
committed by GitHub
parent 5e38d7f220
commit 4bf4870d66
6 changed files with 65 additions and 45 deletions
+43 -43
View File
@@ -62,53 +62,13 @@ window "mainwindow"
elem "split"
type = CHILD
pos = 3,0
size = 634x417
size = 637x440
anchor1 = 0,0
anchor2 = 100,100
saved-params = "splitter"
left = "mapwindow"
right = "infowindow"
is-vert = true
elem "input"
type = INPUT
pos = 3,420
size = 517x20
anchor1 = 0,100
anchor2 = 100,100
background-color = #d3b5b5
is-default = true
border = sunken
saved-params = "command"
elem "saybutton"
type = BUTTON
pos = 600,420
size = 40x20
anchor1 = 100,100
anchor2 = none
saved-params = "is-checked"
text = "Chat"
command = ".winset \"saybutton.is-checked=true ? input.command=\"!say \\\"\" : input.command=\"\"saybutton.is-checked=true ? mebutton.is-checked=false\"\"saybutton.is-checked=true ? oocbutton.is-checked=false\""
button-type = pushbox
elem "oocbutton"
type = BUTTON
pos = 520,420
size = 40x20
anchor1 = 100,100
anchor2 = none
saved-params = "is-checked"
text = "OOC"
command = ".winset \"oocbutton.is-checked=true ? input.command=\"!ooc \\\"\" : input.command=\"\"oocbutton.is-checked=true ? mebutton.is-checked=false\"\"oocbutton.is-checked=true ? saybutton.is-checked=false\""
button-type = pushbox
elem "mebutton"
type = BUTTON
pos = 560,420
size = 40x20
anchor1 = 100,100
anchor2 = none
saved-params = "is-checked"
text = "Me"
command = ".winset \"mebutton.is-checked=true ? input.command=\"!me \\\"\" : input.command=\"\"mebutton.is-checked=true ? saybutton.is-checked=false\"\"mebutton.is-checked=true ? oocbutton.is-checked=false\""
button-type = pushbox
elem "asset_cache_browser"
type = BROWSER
pos = 0,0
@@ -231,10 +191,50 @@ window "outputwindow"
anchor2 = none
saved-params = "pos;size;is-minimized;is-maximized"
is-pane = true
elem "input"
type = INPUT
pos = 2,460
size = 520x20
anchor1 = 0,100
anchor2 = 100,100
background-color = #d3b5b5
is-default = true
border = sunken
saved-params = "command"
elem "saybutton"
type = BUTTON
pos = 600,460
size = 40x20
anchor1 = 100,100
anchor2 = none
saved-params = "is-checked"
text = "Chat"
command = ".winset \"saybutton.is-checked=true ? input.command=\"!say \\\"\" : input.command=\"\"saybutton.is-checked=true ? mebutton.is-checked=false\"\"saybutton.is-checked=true ? oocbutton.is-checked=false\""
button-type = pushbox
elem "oocbutton"
type = BUTTON
pos = 520,460
size = 40x20
anchor1 = 100,100
anchor2 = none
saved-params = "is-checked"
text = "OOC"
command = ".winset \"oocbutton.is-checked=true ? input.command=\"!ooc \\\"\" : input.command=\"\"oocbutton.is-checked=true ? mebutton.is-checked=false\"\"oocbutton.is-checked=true ? saybutton.is-checked=false\""
button-type = pushbox
elem "mebutton"
type = BUTTON
pos = 560,460
size = 40x20
anchor1 = 100,100
anchor2 = none
saved-params = "is-checked"
text = "Me"
command = ".winset \"mebutton.is-checked=true ? input.command=\"!me \\\"\" : input.command=\"\"mebutton.is-checked=true ? saybutton.is-checked=false\"\"mebutton.is-checked=true ? oocbutton.is-checked=false\""
button-type = pushbox
elem "browseroutput"
type = BROWSER
pos = 0,0
size = 640x480
size = 640x456
anchor1 = 0,0
anchor2 = 100,100
background-color = #ffffff
@@ -244,7 +244,7 @@ window "outputwindow"
elem "output"
type = OUTPUT
pos = 0,0
size = 640x480
size = 640x456
anchor1 = 0,0
anchor2 = 100,100
is-default = true