fixes some of the broken darkmode stuff

Altangy · Mar 10, 2019 · 128988b · 128988b
1 parent b3935e1
commit 128988b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/DS13/code/modules/goonchat/darkmode-pref.dm b/DS13/code/modules/goonchat/darkmode-pref.dm
@@ -6,7 +6,7 @@
 	set desc = "Change your chat theme"
 	prefs.toggles ^= DARKMODE
 	prefs.save_preferences()
-	to_chat(usr, "Dark theme (YOU MUST RECONNECT TO SEE THIS CHANGE) [(usr.client.prefs.toggles & DARKMODE) ? "Enabled" : "Disabled"]")
+	to_chat(usr, "Dark theme (YOU MUST CLOSE THE GAME AND LOG BACK IN TO SEE THIS CHANGE) [(usr.client.prefs.toggles & DARKMODE) ? "Enabled" : "Disabled"]")
 	SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Dark theme", "[prefs.toggles & DARKMODE ? "Enabled" : "Disabled"]"))
 
 /client/proc/force_white_theme() //There's no way round it. We're essentially changing the skin by hand. It's painful but it works, and is the way Lummox suggested.
@@ -42,7 +42,7 @@
 	winset(src, "statwindow", "background-color = #272727;background-color = none")
 	winset(src, "statwindow", "text-color = #eaeaea;text-color = #000000")
 	winset(src, "stat", "background-color = #2c2f33;background-color = #FFFFFF")
-	winset(src, "stat", "tab-background-color = #272727;tab-background-color = #FFFFFF")
+	winset(src, "stat", "tab-background-color = #272727;tab-background-color = none")
 	winset(src, "stat", "text-color = #99aab5;text-color = #000000")
 	winset(src, "stat", "tab-text-color = #99aab5;tab-text-color = #000000")
 	//Say, OOC, me Buttons etc.

diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm
@@ -18,7 +18,7 @@
 #define WIDESCREEN		(1<<15) //DeepSpace 13 - Widescreen preference
 #define DARKMODE		(1<<16) //DeepSpace 13 - Darkmode preference
 
-#define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|MEMBER_PUBLIC|INTENT_STYLE|MIDROUND_ANTAG|SOUND_INSTRUMENTS|SOUND_SHIP_AMBIENCE|SOUND_PRAYERS|SOUND_ANNOUNCEMENTS|DARKMODE)
+#define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|MEMBER_PUBLIC|INTENT_STYLE|MIDROUND_ANTAG|SOUND_INSTRUMENTS|SOUND_SHIP_AMBIENCE|SOUND_PRAYERS|SOUND_ANNOUNCEMENTS)
 
 //Chat toggles
 #define CHAT_OOC			(1<<0)

diff --git a/interface/skin.dmf b/interface/skin.dmf
@@ -80,6 +80,7 @@ window "mainwindow"
 		font-size = 10
 		background-color = #d3b5b5
 		is-default = true
+		border = sunken
 		saved-params = "command"
 	elem "saybutton"
 		type = BUTTON