1
0
Эх сурвалжийг харах

[added] numerical `theme['table_bg']` and `theme['table_bg_alt']`

LinaHirata 10 сар өмнө
parent
commit
67deda1be0

+ 2 - 2
locations/Cheatmenu_din.qsrc

@@ -2461,8 +2461,8 @@ $cheatmenu['theme_presets_copy'] = {
 	custom_theme['fcolor'] = theme['fcolor']
 	custom_theme['lcolor'] = theme['lcolor']
 
-	custom_theme['table_bg'] = rgb(func('shortgs', 'hex_str_to_int', $mid($theme['table_bg'], 2, 2)), func('shortgs', 'hex_str_to_int', $mid($theme['table_bg'], 4, 2)), func('shortgs', 'hex_str_to_int', $mid($theme['table_bg'], 6, 2)))
-	custom_theme['table_bg_alt'] = rgb(func('shortgs', 'hex_str_to_int', $mid($theme['table_bg_alt'], 2, 2)), func('shortgs', 'hex_str_to_int', $mid($theme['table_bg_alt'], 4, 2)), func('shortgs', 'hex_str_to_int', $mid($theme['table_bg_alt'], 6, 2)))
+	custom_theme['table_bg'] = theme['table_bg']
+	custom_theme['table_bg_alt'] = theme['table_bg_alt']
 
 	$custom_theme['is_dark'] = str(theme['is_dark'])
 

+ 20 - 2
locations/themes.qsrc

@@ -101,12 +101,18 @@ if $ARGS[0] = 'apply_dynamic':
 		theme['fcolor'] = rgb(255, 255, 255)
 		$theme['fcolor'] = "#FFFFFF"
 
+		theme['table_bg'] = rgb(32, 32, 32)
+		theme['table_bg_alt'] = rgb(48, 48, 48)
+
 		$theme['table_bg'] = "#202020"
 		$theme['table_bg_alt'] = "#303030"
 	else
 		theme['fcolor'] = rgb(0, 0, 0)
 		$theme['fcolor'] = "#000000"
 
+		theme['table_bg'] = rgb(255, 255, 255)
+		theme['table_bg_alt'] = rgb(230, 242, 255)
+
 		$theme['table_bg'] = "#FFFFFF"
 		$theme['table_bg_alt'] = "#E6F2FF"
 	end
@@ -175,6 +181,9 @@ elseif $ARGS[0] = 'set_white':
 	theme['fsize'] = 12
 	$theme['fname'] = 'Tahoma'
 
+	theme['table_bg'] = rgb(255, 255, 255)
+	theme['table_bg_alt'] = rgb(230, 242, 255)
+
 	$theme['table_bg'] = "#FFFFFF"
 	$theme['table_bg_alt'] = "#E6F2FF"
 
@@ -197,6 +206,9 @@ elseif $ARGS[0] = 'set_black':
 	theme['fsize'] = 12
 	$theme['fname'] = 'Tahoma'
 
+	theme['table_bg'] = rgb(32, 32, 32)
+	theme['table_bg_alt'] = rgb(48, 48, 48)
+
 	$theme['table_bg'] = "#202020"
 	$theme['table_bg_alt'] = "#303030"
 
@@ -219,6 +231,9 @@ elseif $ARGS[0] = 'set_gray':
 	theme['fsize'] = 12
 	$theme['fname'] = 'Tahoma'
 
+	theme['table_bg'] = rgb(32, 32, 32)
+	theme['table_bg_alt'] = rgb(48, 48, 48)
+
 	$theme['table_bg'] = "#202020"
 	$theme['table_bg_alt'] = "#303030"
 
@@ -240,8 +255,11 @@ elseif $ARGS[0] = 'set_custom':
 	theme['fsize'] = custom_theme['fsize']
 	$theme['fname'] = $custom_theme['fname']
 	
-	$theme['table_bg'] = func('shortgs', 'rgb_to_hex', custom_theme['table_bg'])
-	$theme['table_bg_alt'] = func('shortgs', 'rgb_to_hex', custom_theme['table_bg_alt'])
+	theme['table_bg'] = custom_theme['table_bg']
+	theme['table_bg_alt'] = custom_theme['table_bg_alt']
+
+	$theme['table_bg'] = func('shortgs', 'rgb_to_hex', theme['table_bg'])
+	$theme['table_bg_alt'] = func('shortgs', 'rgb_to_hex', theme['table_bg_alt'])
 end
 
 if $ARGS[0] = 'check_custom_vars':