Author: cazfi
Date: Fri Jan 29 07:47:00 2016
New Revision: 31668

URL: http://svn.gna.org/viewcvs/freeciv?rev=31668&view=rev
Log:
Removed hardcoded size requests from the votebar setup of the gtk3- and 
gtk3x-client.

See bug #24353

Modified:
    branches/S2_6/client/gui-gtk-3.0/voteinfo_bar.c

Modified: branches/S2_6/client/gui-gtk-3.0/voteinfo_bar.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/voteinfo_bar.c?rev=31668&r1=31667&r2=31668&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.0/voteinfo_bar.c     (original)
+++ branches/S2_6/client/gui-gtk-3.0/voteinfo_bar.c     Fri Jan 29 07:47:00 2016
@@ -152,7 +152,6 @@
   g_signal_connect(button, "clicked",
                    G_CALLBACK(voteinfo_bar_do_vote_callback),
                    GINT_TO_POINTER(CVT_YES));
-  gtk_widget_set_size_request(button, 50, BUTTON_HEIGHT);
   gtk_button_set_focus_on_click(GTK_BUTTON(button), FALSE);
   gtk_container_add(GTK_CONTAINER(hbox), button);
   gtk_widget_set_name(button, "vote yes button");
@@ -160,7 +159,6 @@
 
   label = gtk_label_new("0");
   gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-  gtk_widget_set_size_request(label, 24, -1);
   gtk_container_add(GTK_CONTAINER(hbox), label);
   vib->yes_count_label = label;
 
@@ -168,7 +166,6 @@
   g_signal_connect(button, "clicked",
                    G_CALLBACK(voteinfo_bar_do_vote_callback),
                    GINT_TO_POINTER(CVT_NO));
-  gtk_widget_set_size_request(button, 50, BUTTON_HEIGHT);
   gtk_button_set_focus_on_click(GTK_BUTTON(button), FALSE);
   gtk_container_add(GTK_CONTAINER(hbox), button);
   gtk_widget_set_name(button, "vote no button");
@@ -176,7 +173,6 @@
 
   label = gtk_label_new("0");
   gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-  gtk_widget_set_size_request(label, 24, -1);
   gtk_container_add(GTK_CONTAINER(hbox), label);
   vib->no_count_label = label;
 
@@ -184,7 +180,6 @@
   g_signal_connect(button, "clicked",
                    G_CALLBACK(voteinfo_bar_do_vote_callback),
                    GINT_TO_POINTER(CVT_ABSTAIN));
-  gtk_widget_set_size_request(button, 50, BUTTON_HEIGHT);
   gtk_button_set_focus_on_click(GTK_BUTTON(button), FALSE);
   gtk_container_add(GTK_CONTAINER(hbox), button);
   gtk_widget_set_name(button, "vote abstain button");
@@ -192,13 +187,11 @@
 
   label = gtk_label_new("0");
   gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-  gtk_widget_set_size_request(label, 24, -1);
   gtk_container_add(GTK_CONTAINER(hbox), label);
   vib->abstain_count_label = label;
 
   label = gtk_label_new("/0");
   gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-  gtk_widget_set_size_request(label, 24, -1);
   gtk_container_add(GTK_CONTAINER(hbox), label);
   vib->voter_count_label = label;
 


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to