projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into nikitakit_master
[synfig.git]
/
synfig-studio
/
src
/
gtkmm
/
mod_palette
/
dock_paledit.cpp
diff --git
a/synfig-studio/src/gtkmm/mod_palette/dock_paledit.cpp
b/synfig-studio/src/gtkmm/mod_palette/dock_paledit.cpp
index
03553e0
..
718bdee
100644
(file)
--- a/
synfig-studio/src/gtkmm/mod_palette/dock_paledit.cpp
+++ b/
synfig-studio/src/gtkmm/mod_palette/dock_paledit.cpp
@@
-261,11
+261,17
@@
Dock_PalEdit::refresh()
widget_color->set_size_request(12,12);
widget_color->signal_activate().connect(
sigc::bind(
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
)
);
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
sigc::bind(
sigc::mem_fun(*this,&studio::Dock_PalEdit::show_menu),
i
@@
-294,7
+300,13
@@
Dock_PalEdit::edit_color(int i)
}
void
}
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));
}
{
synfigapp::Main::set_outline_color(get_color(i));
}