cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 11:34:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix hotkey mode button

Browse Source
This commit is contained in:
Mark van Alphen
2019-04-07 18:42:08 +02:00
parent 2ba56c33de
commit 91e6cb9347
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/helper_datums/hotkey_modes.dm
+9
View File
@@ -2,6 +2,15 @@
var/name
var/macro_hotkeys_inactive
var/macro_hotkeys_active
var/mob/my_mob
/datum/hotkey_mode/New(mob)
my_mob = mob
/datum/hotkey_mode/proc/set_winset_values()
winset(my_mob, null, "mainwindow.macro=[macro_hotkeys_inactive] hotkey_toggle.is-checked=false input.focus=true input.background-color=#d3b5b5")
message_admins("hotkey_toggle.command=\".winset \\\"mainwindow.macro != [macro_hotkeys_inactive] ? mainwindow.macro=[macro_hotkeys_inactive] hotkey_toggle.is-checked=false input.focus=true input.background-color=#d3b5b5 : mainwindow.macro=[macro_hotkeys_active] hotkey_toggle.is-checked=true mapwindow.map.focus=true input.background-color=#f0f0f0\\\"\"")
winset(my_mob, null, "hotkey_toggle.command=\".winset \\\"mainwindow.macro != [macro_hotkeys_inactive] ? mainwindow.macro=[macro_hotkeys_inactive] hotkey_toggle.is-checked=false input.focus=true input.background-color=#d3b5b5 : mainwindow.macro=[macro_hotkeys_active] hotkey_toggle.is-checked=true mapwindow.map.focus=true input.background-color=#f0f0f0\\\"\"")
/datum/hotkey_mode/qwerty
name = "QWERTY"
code/modules/mob/living/silicon/robot/login.dm
+2 -2
View File
@@ -3,5 +3,5 @@
regenerate_icons()
show_laws(0)
var/datum/hotkey_mode/cyborg/C = new()
winset(src, null, "mainwindow.macro_hotkey_mode_inactive=[C.macro_hotkeys_inactive] mainwindow.macro_hotkey_mode_active=[C.macro_hotkeys_active] mainwindow.macro=[C.macro_hotkeys_inactive] hotkey_toggle.is-checked=false input.focus=true input.background-color=#d3b5b5")
var/datum/hotkey_mode/cyborg/C = new(src)
C.set_winset_values()
interface/interface.dm
+2 -2
View File
@@ -111,9 +111,9 @@
return
var/datum/hotkey_mode/chosen_mode = hotkey_modes[chosen_mode_name]
var/datum/hotkey_mode/hotkey_mode = new chosen_mode()
var/datum/hotkey_mode/hotkey_mode = new chosen_mode(src)
winset(mob, null, "mainwindow.macro_hotkey_mode_inactive=[hotkey_mode.macro_hotkeys_inactive] mainwindow.macro_hotkey_mode_active=[hotkey_mode.macro_hotkeys_active] mainwindow.macro=[hotkey_mode.macro_hotkeys_inactive] hotkey_toggle.is-checked=false input.focus=true input.background-color=#d3b5b5")
hotkey_mode.set_winset_values()
to_chat(usr, "<span class='info'>Your hotkey mode has been changed to [hotkey_mode.name].</span>")
qdel(hotkey_mode)
interface/skin.dmf
+1 -3
View File
@@ -1526,8 +1526,6 @@ window "mainwindow"
icon = 'icons\\paradise.png'
menu = "menu"
macro = "macro"
macro_hotkey_mode_inactive = "macro"
macro_hotkey_mode_active = "hotkeymode"
saved-params = "pos;size;is-minimized;is-maximized"
elem "asset_cache_browser"
type = BROWSER
@@ -1543,7 +1541,7 @@ window "mainwindow"
saved-params = ""
is-flat = false
text = "Hotkey Toggle"
command = ".winset \"mainwindow.macro != mainwindow.macro_hotkey_mode_inactive ? mainwindow.macro=mainwindow.macro_hotkey_mode_inactive hotkey_toggle.is-checked=false input.focus=true input.background-color=#d3b5b5 : mainwindow.macro=mainwindow.macro_hotkey_mode_active hotkey_toggle.is-checked=true mapwindow.map.focus=true input.background-color=#f0f0f0\""
command = ".winset \"mainwindow.macro != macro ? mainwindow.macro=macro hotkey_toggle.is-checked=false input.focus=true input.background-color=#d3b5b5 : mainwindow.macro=hotkeymode hotkey_toggle.is-checked=true mapwindow.map.focus=true input.background-color=#f0f0f0\""
elem "mainvsplit"
type = CHILD
pos = 3,0