Skip to content

Hide Night Light on unsupported hardware #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lenemter wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Hide Night Light on unsupported hardware #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/DisplayPlug.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ public class Display.Plug : Switchboard.Plug {
stack.add_titled (displays_view, "displays", _("Displays"));

var interface_settings_schema = SettingsSchemaSource.get_default ().lookup ("org.gnome.settings-daemon.plugins.color", true);
if (interface_settings_schema != null && interface_settings_schema.has_key ("night-light-enabled")) {
if (interface_settings_schema != null && interface_settings_schema.has_key ("night-light-enabled") &&
MonitorManager.get_default ().night_light_supported
) {
var nightlight_view = new NightLightView ();
stack.add_titled (nightlight_view, "night-light", _("Night Light"));
}
Expand Down Expand Up @@ -118,9 +120,6 @@ public class Display.Plug : Switchboard.Plug {
search_results.set ("%s → %s".printf (display_name, _("Screen mirroring")), "displays");
search_results.set ("%s → %s".printf (display_name, _("Screen Rotation")), "displays");
search_results.set ("%s → %s".printf (display_name, _("Scaling factor")), "displays");
search_results.set ("%s → %s".printf (display_name, _("Night Light")), "night-light");
search_results.set ("%s → %s → %s".printf (display_name, _("Night Light"), _("Schedule")), "night-light");
search_results.set ("%s → %s → %s".printf (display_name, _("Night Light"), _("Color temperature")), "night-light");
search_results.set ("%s → %s → %s".printf (display_name, _("Filters"), _("Color Blindness")), "filters");
search_results.set ("%s → %s → %s".printf (display_name, _("Filters"), _("Color Vision Deficiency")), "filters");
search_results.set ("%s → %s → %s".printf (display_name, _("Filters"), _("Grayscale")), "filters");
Expand All @@ -130,6 +129,12 @@ public class Display.Plug : Switchboard.Plug {
search_results.set ("%s → %s".printf (display_name, _("Rotation lock")), "displays");
}

if (MonitorManager.get_default ().night_light_supported) {
search_results.set ("%s → %s".printf (display_name, _("Night Light")), "night-light");
search_results.set ("%s → %s → %s".printf (display_name, _("Night Light"), _("Schedule")), "night-light");
search_results.set ("%s → %s → %s".printf (display_name, _("Night Light"), _("Color temperature")), "night-light");
}

return search_results;
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/Interfaces/MutterDisplayConfig.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@

[DBus (name = "org.gnome.Mutter.DisplayConfig")]
public interface MutterDisplayConfigInterface : Object {
public abstract bool night_light_supported { get; }

public abstract void get_resources (out uint serial, out MutterReadDisplayCrtc[] crtcs, out MutterReadDisplayOutput[] outputs, out MutterReadDisplayMode[] modes, out int max_screen_width, out int max_screen_height) throws Error;
public abstract void apply_configuration (uint serial, bool persistent, MutterWriteDisplayCrtc[] crtcs, MutterWriteDisplayOutput[] outputs) throws Error;
public abstract int change_backlight (uint serial, uint output, int value) throws Error;
Expand Down
2 changes: 1 addition & 1 deletion src/Interfaces/SensorManager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class Display.SensorManager : Object {
return instance.once (() => new SensorManager ());
}

private class SensorManager () { }
private SensorManager () { }

construct {
try {
Expand Down
3 changes: 3 additions & 0 deletions src/Objects/MonitorManager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public class Display.MonitorManager : GLib.Object {
public Gee.LinkedList<Display.VirtualMonitor> virtual_monitors { get; construct; }
public Gee.LinkedList<Display.Monitor> monitors { get; construct; }

public bool night_light_supported { get; private set; }
public bool fractional_scale_enabled { get; private set; }
public bool global_scale_required { get; private set; }
public bool mirroring_supported { get; private set; }
Expand Down Expand Up @@ -68,6 +69,8 @@ public class Display.MonitorManager : GLib.Object {
try {
iface = Bus.get_proxy_sync (BusType.SESSION, "org.gnome.Mutter.DisplayConfig", "/org/gnome/Mutter/DisplayConfig");
iface.monitors_changed.connect (get_monitor_config);

night_light_supported = iface.night_light_supported;
} catch (Error e) {
critical (e.message);
}
Expand Down