Added night mode to Tablet #133

Riouken · May 26, 2015 · 4f21678 · 4f21678
1 parent 392d1f6
commit 4f21678
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/@cTab/addons/cTab/functions/fn_updateInterface.sqf b/@cTab/addons/cTab/functions/fn_updateInterface.sqf
@@ -143,13 +143,16 @@ if (isNil "_mode") then {
 				if (_displayName in ["cTab_microDAGR_dsp","cTab_microDAGR_dlg"]) exitWith {
 					if (_nightMode) then {"\cTab\img\microDAGR_background_night_ca.paa"} else {"\cTab\img\microDAGR_background_ca.paa"};
 				};
+				if (_displayName in ["cTab_Tablet_dlg"]) exitWith {
+					if (_nightMode) then {"\cTab\img\tablet_background_night_ca.paa"} else {"\cTab\img\tablet_background_ca.paa"};
+				};
 				""
 			};
 			if (_background != "") then {
 				(_display displayCtrl IDC_CTAB_BACKGROUND) ctrlSetText _background;
 				// call brightness adjustment if this is outside of interface init
 				if (!_interfaceInit) then {
-					[[["brightness",[_displayName,"brightness"] call cTab_fnc_getSettings]]] call cTab_fnc_updateInterface;
+					_settings pushBack ["brightness",[_displayName,"brightness"] call cTab_fnc_getSettings];
 				};
 			};
 		};

diff --git a/@cTab/addons/cTab/img/tablet_background_night_ca.paa b/@cTab/addons/cTab/img/tablet_background_night_ca.paa
diff --git a/@cTab/addons/cTab/player_init.sqf b/@cTab/addons/cTab/player_init.sqf
@@ -141,7 +141,9 @@ cTabSettings = [];
 	["mapType","SAT"],
 	["uavCam",""],
 	["hCam",""],
-	["mapTools",true]
+	["mapTools",true],
+	["nightMode",2],
+	["brightness",0.9]
 ]] call BIS_fnc_setToPairs;
 
 [cTabSettings,"Android",[

diff --git a/@cTab/addons/cTab/tablet/cTab_Tablet_controls.hpp b/@cTab/addons/cTab/tablet/cTab_Tablet_controls.hpp
@@ -181,7 +181,7 @@ class cTab_RscButton_Tablet: cTab_RscButton
 class cTab_Tablet_background: cTab_RscPicture
 {
 	idc = IDC_CTAB_BACKGROUND;
-	text = "\cTab\img\Tablet_background_ca.paa";
+	text = "";
 	x = GUI_GRID_X;
 	y = GUI_GRID_Y;
 	w = GUI_GRID_W;