Skip to content

fix: Make _redrawMenu() append/pop hot items according to sensor pref… #569

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
ner216 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: Make _redrawMenu() append/pop hot items according to sensor pref… #569

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
36 changes: 35 additions & 1 deletion extension.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,15 @@ var VitalsMenuButton = GObject.registerClass({

for (let sensor in this._sensorIcons)
this._settings.connectObject('changed::show-' + sensor, this._showHideSensorsChanged.bind(this), this);

// process sensor group toggles
let sensorGroups = [ 'show-temperature', 'show-voltage', 'show-fan',
'show-memory', 'show-processor', 'show-system',
'show-network', 'show-storage', 'show-battery',
'show-gpu'];

for (let group of sensorGroups)
this._settings.connectObject('changed::' + group, this._redrawMenu.bind(this), this);
}

_initializeMenu() {
Expand Down Expand Up @@ -623,6 +632,20 @@ var VitalsMenuButton = GObject.registerClass({
this._querySensors();
}

// Map hotItem (top bar element) to sensor group
_getSensorGroupFromKey(key) {
if (key.includes("temperature")) return "temperature";
if (key.includes("voltage")) return "voltage";
if (key.includes("fan")) return "fan";
if (key.includes("memory")) return "memory";
if (key.includes("processor")) return "processor";
if (key.includes("system")) return "system";
if (key.includes("network")) return "network";
if (key.includes("storage")) return "storage";
if (key.includes("battery")) return "battery";
if (key.includes("gpu")) return "gpu";
}

_drawMenu() {
// grab list of selected menubar icons
let hotSensors = this._settings.get_strv('hot-sensors');
Expand All @@ -631,7 +654,18 @@ var VitalsMenuButton = GObject.registerClass({
if (key == '__max_network-download__') key = '__network-rx_max__';
if (key == '__max_network-upload__') key = '__network-tx_max__';

this._createHotItem(key);
let sensorGroup = this._getSensorGroupFromKey(key);
if (sensorGroup) {
let isEnabled = this._settings.get_boolean("show-" + sensorGroup);

if (!isEnabled) {
this._removeHotItem(key);
}

if (isEnabled) {
this._createHotItem(key);
}
}
}
}

Expand Down