Skip to content

Commit 60f2c3f

Browse files
committed
Fixed logic for override luminance on macOS
1 parent d204cfb commit 60f2c3f

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

hdr_output/in_game_hdr_settings/in_game_hdr_settings.gd

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ func _ready() -> void:
2525
DisplayServer.window_set_hdr_output_reference_luminance(hdr_settings.get_value(HDR_SETTINGS_SECTION, "hdr_output_reference_luminance", DisplayServer.window_get_hdr_output_reference_luminance(window_id)), window_id)
2626
if overriding_max_luminance_supported():
2727
DisplayServer.window_set_hdr_output_max_luminance(hdr_settings.get_value(HDR_SETTINGS_SECTION, "hdr_output_max_luminance", DisplayServer.window_get_hdr_output_max_luminance(window_id)), window_id)
28-
28+
2929
_auto_adjust_reference = DisplayServer.window_get_hdr_output_reference_luminance(window_id) < 0
3030
_auto_adjust_max = DisplayServer.window_get_hdr_output_max_luminance(window_id) < 0
31-
31+
3232
%BrightnessDisplay.visible = overriding_reference_luminance_supported()
3333
%BrightnessAdjustment.visible = overriding_reference_luminance_supported()
3434
%MaxLumDisplay.visible = overriding_max_luminance_supported()
@@ -54,18 +54,14 @@ func erase_settings() -> void:
5454

5555

5656
func overriding_reference_luminance_supported() -> bool:
57-
if DisplayServer.get_name() == &"Windows":
58-
return true
59-
else:
60-
return false
57+
return DisplayServer.get_name() == &"Windows"
6158

6259

6360
func overriding_max_luminance_supported() -> bool:
6461
var display_server_name = DisplayServer.get_name()
65-
if display_server_name == &"Windows" || display_server_name == &"macOS":
66-
return true
67-
else:
68-
return false
62+
return display_server_name == &"Windows" \
63+
or display_server_name == &"macOS" \
64+
or (display_server_name == &"embedded" and OS.get_name() == &"macOS")
6965

7066

7167
func _process(_delta: float) -> void:
@@ -77,15 +73,15 @@ func _process(_delta: float) -> void:
7773
if %HDRCheckButton.button_pressed != hdr_output_enabled:
7874
%HDRCheckButton.button_pressed = hdr_output_enabled
7975
%HDROptions.visible = hdr_output_enabled and hdr_supported
80-
76+
8177
%BrightnessSlider.max_value = DisplayServer.window_get_hdr_output_current_max_luminance()
8278
%BrightnessSlider.value = DisplayServer.window_get_hdr_output_current_reference_luminance(window_id)
8379
%BrightnessLabel.text = "%0.0f" % DisplayServer.window_get_hdr_output_current_reference_luminance(window_id)
84-
80+
8581
$%MaxLumSlider.min_value = DisplayServer.window_get_hdr_output_current_reference_luminance(window_id)
8682
%MaxLumSlider.value = DisplayServer.window_get_hdr_output_current_max_luminance()
8783
%MaxLumLabel.text = "%0.0f" % DisplayServer.window_get_hdr_output_current_max_luminance()
88-
84+
8985
%ResetBrightness.disabled = DisplayServer.window_get_hdr_output_reference_luminance(window_id) < 0
9086
%ResetMaxLum.disabled = DisplayServer.window_get_hdr_output_max_luminance(window_id) < 0
9187

0 commit comments

Comments
 (0)