X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Fsrc%2Fgtkmm%2Fmod_palette%2Fdock_paledit.cpp;h=718bdee177904f844f51679b79fd97b300cb7cff;hb=2746572ecb1002c12a158d7d209d30bbade38220;hp=88c88920d8fc6b8e2df5748f1471a043adf6a7db;hpb=adfc80c126f482d7ea2bac38001a2c4a7c7df88c;p=synfig.git diff --git a/synfig-studio/src/gtkmm/mod_palette/dock_paledit.cpp b/synfig-studio/src/gtkmm/mod_palette/dock_paledit.cpp index 88c8892..718bdee 100644 --- a/synfig-studio/src/gtkmm/mod_palette/dock_paledit.cpp +++ b/synfig-studio/src/gtkmm/mod_palette/dock_paledit.cpp @@ -121,7 +121,7 @@ Dock_PalEdit::Dock_PalEdit(): //palette_settings(new PaletteSettings(this,"colors")), table(2,2,false) { - action_group=Gtk::ActionGroup::create(); + action_group=Gtk::ActionGroup::create("action_group_pal_edit"); action_group->add(Gtk::Action::create( "palette-add-color", Gtk::StockID("gtk-add"), @@ -261,11 +261,17 @@ Dock_PalEdit::refresh() widget_color->set_size_request(12,12); widget_color->signal_activate().connect( sigc::bind( - sigc::mem_fun(*this,&studio::Dock_PalEdit::select_color), + sigc::mem_fun(*this,&studio::Dock_PalEdit::select_fill_color), i ) ); - widget_color->signal_secondary().connect( + widget_color->signal_middle_click().connect( + sigc::bind( + sigc::mem_fun(*this,&studio::Dock_PalEdit::select_outline_color), + i + ) + ); + widget_color->signal_right_click().connect( sigc::bind( sigc::mem_fun(*this,&studio::Dock_PalEdit::show_menu), i @@ -294,7 +300,13 @@ Dock_PalEdit::edit_color(int i) } void -Dock_PalEdit::select_color(int i) +Dock_PalEdit::select_fill_color(int i) +{ + synfigapp::Main::set_fill_color(get_color(i)); +} + +void +Dock_PalEdit::select_outline_color(int i) { synfigapp::Main::set_outline_color(get_color(i)); }