From: genete <genete@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Sat, 13 Sep 2008 08:24:31 +0000 (+0000)
Subject: Apply patch http://patches.synfig.org/r/2/ Allow "Reset FG and BG colors" & buttons... 
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=2e93d92860d520aeb368c70d43d44e1f07dd9859;p=synfig.git

Apply patch patches.synfig.org/r/2/ Allow "Reset FG and BG colors" & buttons and "Swap FG and BG colors" icons to fit in the button size in Default Ubuntu
Theme (Humans)


git-svn-id: https://synfig.svn.sourceforge.net/svnroot/synfig@2051 1f10aa63-cdf2-0310-b900-c93c546f37ac
---

diff --git a/synfig-studio/trunk/src/gtkmm/widget_defaults.cpp b/synfig-studio/trunk/src/gtkmm/widget_defaults.cpp
index 3e51bf5..1db0afa 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_defaults.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_defaults.cpp
@@ -209,7 +209,7 @@ Widget_Defaults::Widget_Defaults()
 		widget_fg_color->show();
 		widget_fg_color->set_size_request(16,16);
 		widget_fg_color->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Defaults::on_fg_color_clicked));
-		subtable->attach(*widget_fg_color, 0, 2, 0, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+		subtable->attach(*widget_fg_color, 0, 4, 0, 4, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
 		tooltips_.set_tip(*widget_fg_color,_("Foreground Color"));
 
 		// Background Color
@@ -217,7 +217,7 @@ Widget_Defaults::Widget_Defaults()
 		widget_bg_color->show();
 		widget_bg_color->set_size_request(16,16);
 		widget_bg_color->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Defaults::on_bg_color_clicked));
-		subtable->attach(*widget_bg_color, 1, 3, 1, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+		subtable->attach(*widget_bg_color, 3, 7, 3, 7, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
 		tooltips_.set_tip(*widget_bg_color,_("Background Color"));
 
 		Gtk::Image* icon;
@@ -234,7 +234,7 @@ Widget_Defaults::Widget_Defaults()
 		//button_swap->set_size_request(16/3,16/3);
 		dynamic_cast<Gtk::Misc*>(button_swap->get_child())->set_padding(0,0);
 		button_swap->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Defaults::on_swap_color_clicked));
-		subtable->attach(*button_swap, 2, 3, 0, 1, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
+		subtable->attach(*button_swap, 4, 7, 0, 3, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
 		tooltips_.set_tip(*button_swap,_("Swap Background and\nForeground Colors"));
 
 		// Reset button
@@ -248,7 +248,7 @@ Widget_Defaults::Widget_Defaults()
 		dynamic_cast<Gtk::Misc*>(button_reset->get_child())->set_padding(0,0);
 		//button_reset->set_size_request(16/3,16/3);
 		button_reset->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Defaults::on_reset_color_clicked));
-		subtable->attach(*button_reset, 0,1, 2, 3, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
+		subtable->attach(*button_reset, 0, 3, 4, 7, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
 		tooltips_.set_tip(*button_reset,_("Reset Colors to Black and White"));