mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-03 21:46:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hide brush angle when it's not necessary

Browse Source
This commit is contained in:
David Capello 2015-07-03 13:41:50 -03:00
parent 6d6894c48e
commit 17e1c22a65
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,8 +170,7 @@ private:
BrushPopup m_popupWindow; BrushPopup m_popupWindow;
}; };
class ContextBar::BrushSizeField : public IntEntry class ContextBar::BrushSizeField : public IntEntry {
{
public: public:
BrushSizeField() : IntEntry(Brush::kMinBrushSize, Brush::kMaxBrushSize) { BrushSizeField() : IntEntry(Brush::kMinBrushSize, Brush::kMaxBrushSize) {
setSuffix("px"); setSuffix("px");
@ -911,6 +910,8 @@ void ContextBar::onBrushSizeChange()
{ {
if (m_activeBrush->type() != kImageBrushType) if (m_activeBrush->type() != kImageBrushType)
discardActiveBrush(); discardActiveBrush();
updateForCurrentTool();
} }
void ContextBar::onBrushAngleChange() void ContextBar::onBrushAngleChange()
@ -1012,6 +1013,12 @@ void ContextBar::updateForTool(tools::Tool* tool)
// True if we have an image as brush // True if we have an image as brush
bool hasImageBrush = (activeBrush()->type() == kImageBrushType); bool hasImageBrush = (activeBrush()->type() == kImageBrushType);
// True if the brush type supports angle.
bool hasBrushWithAngle =
(activeBrush()->size() > 1) &&
(activeBrush()->type() == kSquareBrushType ||
activeBrush()->type() == kLineBrushType);
// True if the current tool is eyedropper. // True if the current tool is eyedropper.
bool isEyedropper = tool && bool isEyedropper = tool &&
(tool->getInk(0)->isEyedropper() || (tool->getInk(0)->isEyedropper() ||
@ -1048,7 +1055,7 @@ void ContextBar::updateForTool(tools::Tool* tool)
// Show/Hide fields // Show/Hide fields
m_brushType->setVisible(supportOpacity && (!isFloodfill || (isFloodfill && hasImageBrush))); m_brushType->setVisible(supportOpacity && (!isFloodfill || (isFloodfill && hasImageBrush)));
m_brushSize->setVisible(supportOpacity && !isFloodfill && !hasImageBrush); m_brushSize->setVisible(supportOpacity && !isFloodfill && !hasImageBrush);
m_brushAngle->setVisible(supportOpacity && !isFloodfill && !hasImageBrush); m_brushAngle->setVisible(supportOpacity && !isFloodfill && !hasImageBrush && hasBrushWithAngle);
m_brushPatternField->setVisible(supportOpacity && hasImageBrush); m_brushPatternField->setVisible(supportOpacity && hasImageBrush);
m_inkType->setVisible(hasInk && !hasImageBrush); m_inkType->setVisible(hasInk && !hasImageBrush);
m_inkOpacityLabel->setVisible(hasInkWithOpacity && supportOpacity); m_inkOpacityLabel->setVisible(hasInkWithOpacity && supportOpacity);