mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-28 00:35:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add an option to share ink/opacity parameters between all tools

Browse Source
This commit is contained in:
David Capello 2015-07-23 10:07:07 -03:00
parent 692a4cf009
commit 66ddc62a76
2 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/pref.xml
View File

@ -120,6 +120,10 @@
<option id="channel" type="EyedropperChannel" default="EyedropperChannel::COLOR_ALPHA" /> <option id="channel" type="EyedropperChannel" default="EyedropperChannel::COLOR_ALPHA" />
<option id="sample" type="EyedropperSample" default="EyedropperSample::ALL_LAYERS" /> <option id="sample" type="EyedropperSample" default="EyedropperSample::ALL_LAYERS" />
</section> </section>
<section id="shared">
<option id="share_ink" type="bool" default="false" />
<option id="ink" type="app::tools::InkType" default="app::tools::InkType::DEFAULT" />
</section>
</global> </global>
<tool> <tool>

49
src/app/ui/context_bar.cpp
View File

@ -352,10 +352,13 @@ protected:
MenuItem MenuItem
replace("Replace Pixel"), replace("Replace Pixel"),
alphacompo("Alpha Compositing"), alphacompo("Alpha Compositing"),
lockalpha("Lock Alpha"); lockalpha("Lock Alpha"),
alltools("Same in all Tools");
menu.addChild(&replace); menu.addChild(&replace);
menu.addChild(&alphacompo); menu.addChild(&alphacompo);
menu.addChild(&lockalpha); menu.addChild(&lockalpha);
menu.addChild(new MenuSeparator);
menu.addChild(&alltools);
Tool* tool = App::instance()->activeTool(); Tool* tool = App::instance()->activeTool();
switch (Preferences::instance().tool(tool).ink()) { switch (Preferences::instance().tool(tool).ink()) {
@ -363,10 +366,12 @@ protected:
case tools::InkType::ALPHA_COMPOSITING: alphacompo.setSelected(true); break; case tools::InkType::ALPHA_COMPOSITING: alphacompo.setSelected(true); break;
case tools::InkType::LOCK_ALPHA: lockalpha.setSelected(true); break; case tools::InkType::LOCK_ALPHA: lockalpha.setSelected(true); break;
} }
alltools.setSelected(Preferences::instance().shared.shareInk());
replace.Click.connect(Bind<void>(&InkTypeField::selectInk, this, InkType::REPLACE_PIXEL)); replace.Click.connect(Bind<void>(&InkTypeField::selectInk, this, InkType::REPLACE_PIXEL));
alphacompo.Click.connect(Bind<void>(&InkTypeField::selectInk, this, InkType::ALPHA_COMPOSITING)); alphacompo.Click.connect(Bind<void>(&InkTypeField::selectInk, this, InkType::ALPHA_COMPOSITING));
lockalpha.Click.connect(Bind<void>(&InkTypeField::selectInk, this, InkType::LOCK_ALPHA)); lockalpha.Click.connect(Bind<void>(&InkTypeField::selectInk, this, InkType::LOCK_ALPHA));
alltools.Click.connect(Bind<void>(&InkTypeField::onSameInAllTools, this));
menu.showPopup(gfx::Point(bounds.x, bounds.y+bounds.h)); menu.showPopup(gfx::Point(bounds.x, bounds.y+bounds.h));
@ -374,12 +379,39 @@ protected:
} }
void selectInk(InkType inkType) { void selectInk(InkType inkType) {
Tool* tool = App::instance()->activeTool(); Preferences& pref = Preferences::instance();
Preferences::instance().tool(tool).ink(inkType);
if (pref.shared.shareInk()) {
for (Tool* tool : *App::instance()->getToolBox())
pref.tool(tool).ink(inkType);
}
else {
Tool* tool = App::instance()->activeTool();
pref.tool(tool).ink(inkType);
}
m_owner->updateForCurrentTool(); m_owner->updateForCurrentTool();
} }
void onSameInAllTools() {
Preferences& pref = Preferences::instance();
bool newState = !pref.shared.shareInk();
pref.shared.shareInk(newState);
if (newState) {
Tool* activeTool = App::instance()->activeTool();
InkType inkType = pref.tool(activeTool).ink();
int opacity = pref.tool(activeTool).opacity();
for (Tool* tool : *App::instance()->getToolBox()) {
if (tool != activeTool) {
pref.tool(tool).ink(inkType);
pref.tool(tool).opacity(opacity);
}
}
}
}
ContextBar* m_owner; ContextBar* m_owner;
}; };
@ -398,8 +430,15 @@ protected:
base::ScopedValue<bool> lockFlag(g_updatingFromCode, true, g_updatingFromCode); base::ScopedValue<bool> lockFlag(g_updatingFromCode, true, g_updatingFromCode);
int newValue = getValue(); int newValue = getValue();
Tool* tool = App::instance()->activeTool(); Preferences& pref = Preferences::instance();
Preferences::instance().tool(tool).opacity(newValue); if (pref.shared.shareInk()) {
for (Tool* tool : *App::instance()->getToolBox())
pref.tool(tool).opacity(newValue);
}
else {
Tool* tool = App::instance()->activeTool();
pref.tool(tool).opacity(newValue);
}
} }
}; };