[gnome-system-monitor] Duplicated code refactored
- From: Robert Roth <robertroth src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-system-monitor] Duplicated code refactored
- Date: Wed, 13 Feb 2013 20:37:01 +0000 (UTC)
commit b92021d4c37454c54085a788fd581813b5f8c743
Author: Robert Roth <robert roth off gmail com>
Date: Wed Feb 13 22:25:13 2013 +0200
Duplicated code refactored
src/load-graph.cpp | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/src/load-graph.cpp b/src/load-graph.cpp
index 11a81bc..8be60cb 100644
--- a/src/load-graph.cpp
+++ b/src/load-graph.cpp
@@ -131,12 +131,8 @@ void draw_background(LoadGraph *graph) {
if (graph->type == LOAD_GRAPH_NET) {
// operation orders matters so it's 0 if i == num_bars
guint64 rate = graph->net.max - (i * graph->net.max / num_bars);
- const std::string caption(procman::format_network_rate(rate, graph->net.max));
- pango_layout_set_text (layout, caption.c_str(), -1);
- pango_layout_get_extents (layout, NULL, &extents);
- cairo_move_to (cr, graph->indent - 1.0 * extents.width / PANGO_SCALE + 20,
- y - 1.0 * extents.height / PANGO_SCALE / 2);
- pango_cairo_show_layout (cr, layout);
+ const std::string captionstr(procman::format_network_rate(rate, graph->net.max));
+ caption = g_strdup(captionstr.c_str());
} else {
// operation orders matters so it's 0 if i == num_bars
guint max = 100;
@@ -144,13 +140,13 @@ void draw_background(LoadGraph *graph) {
max = 100 * graph->n;
}
caption = g_strdup_printf("%d %%", max - i * (max / num_bars));
- pango_layout_set_text (layout, caption, -1);
- pango_layout_get_extents (layout, NULL, &extents);
- cairo_move_to (cr, graph->indent - 1.0 * extents.width / PANGO_SCALE + 20,
- y - 1.0 * extents.height / PANGO_SCALE / 2);
- pango_cairo_show_layout (cr, layout);
- g_free (caption);
}
+ pango_layout_set_text (layout, caption, -1);
+ pango_layout_get_extents (layout, NULL, &extents);
+ cairo_move_to (cr, graph->indent - 1.0 * extents.width / PANGO_SCALE + 20,
+ y - 1.0 * extents.height / PANGO_SCALE / 2);
+ pango_cairo_show_layout (cr, layout);
+ g_free(caption);
cairo_set_source_rgba (cr, 0, 0, 0, 0.75);
cairo_move_to (cr, graph->rmargin + graph->indent - 3, i * graph->graph_dely + 0.5);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]