Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/Indicator/Widgets/IndicatorWidgetFrequency.vala
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ public class Monitor.IndicatorWidgetFrequency : Monitor.IndicatorWidget {
public override void update_label (Value value) {
double frequency = value.get_double ();

label.label = ("%.2f %s").printf (frequency, _("GHz"));
label.label = Utils.Strings.format_frequency (frequency);
}
}
4 changes: 2 additions & 2 deletions src/Resources/CPU.vala
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ public class Monitor.CPU : Object {
private double _frequency;
public double frequency {
get {
// Convert kHz to GHz
return (double) (_frequency / 1000000);
// Convert kHz to MHz
return (double) (_frequency / 1000);
}
}
public double temperature_mean {
Expand Down
7 changes: 7 additions & 0 deletions src/Utils.vala
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,13 @@ public class Monitor.Utils.Strings {
return pretty;
}

public static string format_frequency (double mhz) {
if (mhz >= 1000.0) {
return "%.2f %s".printf (mhz / 1000.0, _("GHz"));
}

return "%.0f %s".printf (mhz, _("MHz"));
}
}

public class Monitor.Utils.Colors : Object {
Expand Down
2 changes: 1 addition & 1 deletion src/Views/SystemView/SystemCPUView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public class Monitor.SystemCPUView : Monitor.WidgetResource {
}

main_metric_value = ("%d%%").printf (cpu.percentage);
cpu_frequency_label.text = ("%.2f %s").printf (cpu.frequency, _("GHz"));
cpu_frequency_label.text = Utils.Strings.format_frequency (cpu.frequency);
}

private Gtk.Grid grid_core_labels () {
Expand Down
Loading