root
/
aseprite
mirror of https://github.com/aseprite/aseprite.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Hide ink combobox for tools that doesn't make sense to change the ink 

For example, eyedropper, selection, etc. are special tools that shouldn't
be allowed to change the ink (to avoid confusion).
This commit is contained in:
David Capello 2013-04-01 21:05:33 -03:00
parent b879be9c6d
commit 6cbe1fa5a0
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/widgets/context_bar.cpp
View File

@ -339,7 +339,7 @@ ContextBar::ContextBar()
addChild(m_toleranceLabel = new Label("Tolerance:"));
addChild(m_tolerance = new ToleranceField());
addChild(new Label("Ink:"));
addChild(m_inkLabel = new Label("Ink:"));
addChild(m_inkType = new InkTypeField());
addChild(m_opacityLabel = new Label("Opacity:"));
@ -414,6 +414,10 @@ void ContextBar::onCurrentToolChange()
currentTool->getInk(1)->isPaint() ||
currentTool->getInk(1)->isEffect());
// True if it makes sense to change the ink property for the current
// tool.
bool hasInk = hasOpacity;
// True if the current tool needs tolerance options
bool hasTolerance = (currentTool->getPointShape(0)->isFloodFill() ||
currentTool->getPointShape(1)->isFloodFill());
@ -428,6 +432,8 @@ void ContextBar::onCurrentToolChange()
m_brushSize->setVisible(hasOpacity);
m_brushAngle->setVisible(hasOpacity);
m_opacityLabel->setVisible(hasOpacity);
m_inkLabel->setVisible(hasInk);
m_inkType->setVisible(hasInk);
m_inkOpacity->setVisible(hasOpacity);
m_toleranceLabel->setVisible(hasTolerance);
m_tolerance->setVisible(hasTolerance);

1
src/widgets/context_bar.h
View File

@ -55,6 +55,7 @@ private:
BrushSizeField* m_brushSize;
ui::Label* m_toleranceLabel;
ToleranceField* m_tolerance;
ui::Label* m_inkLabel;
InkTypeField* m_inkType;
ui::Label* m_opacityLabel;
InkOpacityField* m_inkOpacity;