This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository panel-plugins/xfce4-cpufreq-plugin.
commit 929bdcb58e0da2c21baa224fc6a35302947f5231
Author: Andre Miranda <andre...@gmail.com>
Date: Fri Nov 4 22:40:40 2016 -0300
Replace alignment by h/valign and h/vexpand
---
panel-plugin/xfce4-cpufreq-configure.c | 21 ++++++++++++++++-----
panel-plugin/xfce4-cpufreq-overview.c | 29 +++++++++++++++++++----------
panel-plugin/xfce4-cpufreq-plugin.c | 18 ++++++++++--------
3 files changed, 45 insertions(+), 23 deletions(-)
diff --git a/panel-plugin/xfce4-cpufreq-configure.c
b/panel-plugin/xfce4-cpufreq-configure.c
index 5638da1..ce872e6 100644
--- a/panel-plugin/xfce4-cpufreq-configure.c
+++ b/panel-plugin/xfce4-cpufreq-configure.c
@@ -208,7 +208,12 @@ cpufreq_configure (XfcePanelPlugin *plugin)
gtk_frame_set_label_widget (GTK_FRAME (frame), label);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- align = gtk_alignment_new (0.5, 0.5, 1, 1);
+ align = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1);
+ gtk_widget_set_halign(align, GTK_ALIGN_START);
+ gtk_widget_set_valign(align, GTK_ALIGN_CENTER);
+ gtk_widget_set_hexpand(align, TRUE);
+ gtk_widget_set_vexpand(align, TRUE);
+
gtk_container_add (GTK_CONTAINER (frame), align);
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, BORDER*3, 0);
@@ -221,7 +226,7 @@ cpufreq_configure (XfcePanelPlugin *plugin)
label = gtk_label_new_with_mnemonic (_("_Update interval:"));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
gtk_size_group_add_widget (sg0, label);
spinner = configure->spinner_timeout =
@@ -241,7 +246,11 @@ cpufreq_configure (XfcePanelPlugin *plugin)
gtk_frame_set_label_widget (GTK_FRAME (frame), label);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- align = gtk_alignment_new (0.5, 0.5, 1, 1);
+ align = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1);
+ gtk_widget_set_halign(align, GTK_ALIGN_FILL);
+ gtk_widget_set_valign(align, GTK_ALIGN_CENTER);
+ gtk_widget_set_hexpand(align, TRUE);
+ gtk_widget_set_vexpand(align, TRUE);
gtk_container_add (GTK_CONTAINER (frame), align);
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, BORDER * 3, 0);
@@ -255,7 +264,8 @@ cpufreq_configure (XfcePanelPlugin *plugin)
label = gtk_label_new_with_mnemonic (_("_Font:"));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+ gtk_label_set_xalign (GTK_LABEL (label), 0);
gtk_size_group_add_widget (sg0, label);
button = configure->fontname = gtk_button_new ();
@@ -273,7 +283,8 @@ cpufreq_configure (XfcePanelPlugin *plugin)
label = gtk_label_new_with_mnemonic (_("_Display CPU:"));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+ gtk_label_set_xalign (GTK_LABEL (label), 0);
gtk_size_group_add_widget (sg0, label);
combo = configure->combo_cpu = gtk_combo_box_new_text ();
diff --git a/panel-plugin/xfce4-cpufreq-overview.c
b/panel-plugin/xfce4-cpufreq-overview.c
index a5a01df..30f5a2a 100644
--- a/panel-plugin/xfce4-cpufreq-overview.c
+++ b/panel-plugin/xfce4-cpufreq-overview.c
@@ -53,12 +53,14 @@ cpufreq_overview_add (CpuInfo *cpu, guint cpu_number,
GtkWidget *dialog_hbox)
gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
icon = gtk_image_new_from_icon_name ("xfce4-cpufreq-plugin",
GTK_ICON_SIZE_BUTTON);
- gtk_misc_set_alignment (GTK_MISC (icon), 1, 0.5);
gtk_misc_set_padding (GTK_MISC (icon), 5, 10);
+ gtk_widget_set_halign (icon, GTK_ALIGN_END);
+ gtk_widget_set_valign (icon, GTK_ALIGN_CENTER);
gtk_box_pack_start (GTK_BOX (hbox), icon, TRUE, TRUE, 0);
text = g_strdup_printf ("<b>CPU %d</b>", cpu_number);
label = gtk_label_new (text);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+ gtk_label_set_xalign (GTK_LABEL (label), 0);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
g_free (text);
@@ -72,7 +74,8 @@ cpufreq_overview_add (CpuInfo *cpu, guint cpu_number,
GtkWidget *dialog_hbox)
label = gtk_label_new (_("Scaling driver:"));
gtk_size_group_add_widget (sg0, label);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+ gtk_label_set_xalign (GTK_LABEL (label), 0);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
if (cpu->scaling_driver != NULL)
@@ -82,7 +85,8 @@ cpufreq_overview_add (CpuInfo *cpu, guint cpu_number,
GtkWidget *dialog_hbox)
label = gtk_label_new (text);
gtk_size_group_add_widget (sg1, label);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+ gtk_label_set_xalign (GTK_LABEL (label), 0);
gtk_box_pack_end (GTK_BOX (hbox), label, TRUE, TRUE, 0);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
g_free (text);
@@ -93,7 +97,8 @@ cpufreq_overview_add (CpuInfo *cpu, guint cpu_number,
GtkWidget *dialog_hbox)
label = gtk_label_new (_("Available frequencies:"));
gtk_size_group_add_widget (sg0, label);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+ gtk_label_set_xalign (GTK_LABEL (label), 0);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
if (cpu->available_freqs != NULL) /* Linux 2.6 with scaling support */
@@ -139,7 +144,8 @@ cpufreq_overview_add (CpuInfo *cpu, guint cpu_number,
GtkWidget *dialog_hbox)
text = g_strdup_printf ("<b>%s</b> (current frequency)", text);
label = gtk_label_new (text);
gtk_size_group_add_widget (sg1, label);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+ gtk_label_set_xalign (GTK_LABEL (label), 0);
gtk_box_pack_end (GTK_BOX (hbox), label, TRUE, TRUE, 0);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
g_free (text);
@@ -152,9 +158,10 @@ cpufreq_overview_add (CpuInfo *cpu, guint cpu_number,
GtkWidget *dialog_hbox)
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, BORDER);
gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE,
0);
- label = gtk_label_new (_("Available governors:"));\
+ label = gtk_label_new (_("Available governors:"));
gtk_size_group_add_widget (sg0, label);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+ gtk_label_set_xalign (GTK_LABEL (label), 0);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
combo = gtk_combo_box_new_text ();
@@ -180,13 +187,15 @@ cpufreq_overview_add (CpuInfo *cpu, guint cpu_number,
GtkWidget *dialog_hbox)
label = gtk_label_new (_("Current governor:"));
gtk_size_group_add_widget (sg0, label);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+ gtk_label_set_xalign (GTK_LABEL (label), 0);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
text = g_strdup_printf ("<b>%s</b>", cpu->cur_governor);
label = gtk_label_new (text);
gtk_size_group_add_widget (sg1, label);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+ gtk_label_set_xalign (GTK_LABEL (label), 0);
gtk_box_pack_end (GTK_BOX (hbox), label, TRUE, TRUE, 0);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
g_free (text);
diff --git a/panel-plugin/xfce4-cpufreq-plugin.c
b/panel-plugin/xfce4-cpufreq-plugin.c
index 98fceda..6e606e6 100644
--- a/panel-plugin/xfce4-cpufreq-plugin.c
+++ b/panel-plugin/xfce4-cpufreq-plugin.c
@@ -239,14 +239,14 @@ cpufreq_widgets_layout (void)
if (small) {
if (orientation == GTK_ORIENTATION_VERTICAL) {
if (cpuFreq->icon)
- gtk_misc_set_alignment (GTK_MISC
(cpuFreq->icon), 0.5, 0);
+ gtk_widget_set_halign (cpuFreq->icon,
GTK_ALIGN_CENTER);
if (cpuFreq->label)
- gtk_misc_set_alignment (GTK_MISC
(cpuFreq->label), 0.5, 0);
+ gtk_widget_set_halign (cpuFreq->label,
GTK_ALIGN_CENTER);
} else {
if (cpuFreq->icon)
- gtk_misc_set_alignment (GTK_MISC
(cpuFreq->icon), 0, 0.5);
+ gtk_widget_set_valign (cpuFreq->icon,
GTK_ALIGN_CENTER);
if (cpuFreq->label)
- gtk_misc_set_alignment (GTK_MISC
(cpuFreq->label), 0, 0.5);
+ gtk_widget_set_valign (cpuFreq->label,
GTK_ALIGN_CENTER);
}
if (cpuFreq->label)
gtk_label_set_justify (GTK_LABEL (cpuFreq->label),
@@ -260,14 +260,16 @@ cpufreq_widgets_layout (void)
} else {
if (orientation == GTK_ORIENTATION_VERTICAL) {
if (cpuFreq->icon)
- gtk_misc_set_alignment (GTK_MISC
(cpuFreq->icon), 0.5, 1.0);
+ gtk_widget_set_halign (cpuFreq->icon,
GTK_ALIGN_CENTER);
+ gtk_widget_set_valign (cpuFreq->icon,
GTK_ALIGN_END);
if (cpuFreq->label)
- gtk_misc_set_alignment (GTK_MISC
(cpuFreq->label), 0.5, 0);
+ gtk_widget_set_halign (cpuFreq->label,
GTK_ALIGN_CENTER);
} else {
if (cpuFreq->icon)
- gtk_misc_set_alignment (GTK_MISC
(cpuFreq->icon), 0, 0.5);
+ gtk_widget_set_valign (cpuFreq->icon,
GTK_ALIGN_CENTER);
if (cpuFreq->label)
- gtk_misc_set_alignment (GTK_MISC
(cpuFreq->label), 1.0, 0.5);
+ gtk_widget_set_halign (cpuFreq->label,
GTK_ALIGN_END);
+ gtk_widget_set_valign (cpuFreq->label,
GTK_ALIGN_CENTER);
pos = resized ? 1 : 0;
}
if (cpuFreq->label)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
