Skip to content

Fix zoom changes brush size #765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alxvth merged 2 commits into from
Jan 9, 2025
Merged

Fix zoom changes brush size #765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc88e13
Add optional modifier to PixelSelectionTool
alxvth Jan 9, 2025
35fa42e
Fix typo
alxvth Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions ManiVault/src/util/PixelSelectionTool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ PixelSelectionTool::PixelSelectionTool(QWidget* targetWidget, const bool& enable
_active(false),
_notifyDuringSelection(true),
_brushRadius(BRUSH_RADIUS_DEFAULT),
_fixedBrushRadiusModifier(Qt::NoModifier),
_mousePosition(),
_mousePositions(),
_mouseButtons(),
Expand Down Expand Up @@ -126,6 +127,16 @@ void PixelSelectionTool::setBrushRadius(const float& brushRadius)
paint();
}

Qt::KeyboardModifier PixelSelectionTool::getFixedBrushRadiusModifier() const
{
return _fixedBrushRadiusModifier;
}

void PixelSelectionTool::setFixedBrushRadiusModifier(Qt::KeyboardModifier fixedBrushRadiusModifier)
{
_fixedBrushRadiusModifier = fixedBrushRadiusModifier;
}

QColor PixelSelectionTool::getMainColor() const
{
return _mainColor;
Expand Down Expand Up @@ -495,6 +506,9 @@ bool PixelSelectionTool::eventFilter(QObject* target, QEvent* event)
case PixelSelectionType::Brush:
case PixelSelectionType::Sample:
{
if (_fixedBrushRadiusModifier != Qt::NoModifier && QGuiApplication::keyboardModifiers() == _fixedBrushRadiusModifier)
break;

if (wheelEvent->angleDelta().y() < 0)
setBrushRadius(_brushRadius - BRUSH_RADIUS_DELTA);
else
Expand Down
9 changes: 8 additions & 1 deletion ManiVault/src/util/PixelSelectionTool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ class CORE_EXPORT PixelSelectionTool : public QObject
*/
void setBrushRadius(const float& brushRadius);

/** Get fixed brush radius modifier */
Qt::KeyboardModifier getFixedBrushRadiusModifier() const;

/** Set fixed brush radius modifier */
void setFixedBrushRadiusModifier(Qt::KeyboardModifier fixedBrushRadiusModifier);

/** Get main drawing color */
QColor getMainColor() const;

Expand All @@ -99,7 +105,7 @@ class CORE_EXPORT PixelSelectionTool : public QObject
void setChanged();

/**
* Get whether the selection process is cBurrently active
* Get whether the selection process is currently active
* @return Boolean indicating whether the selection process is currently active
*/
bool isActive() const {
Expand Down Expand Up @@ -186,6 +192,7 @@ class CORE_EXPORT PixelSelectionTool : public QObject
bool _active; /** Whether the selection process is active */
bool _notifyDuringSelection; /** Whether the selection is published continuously or at the end */
float _brushRadius; /** Brush radius */
Qt::KeyboardModifier _fixedBrushRadiusModifier; /** Do not change brush radius when fixed by pressing a key (e.g. for navigation) */
QPoint _mousePosition; /** Current mouse position */
QVector<QPoint> _mousePositions; /** Recorded mouse positions */
int _mouseButtons; /** State of the left, middle and right mouse buttons */
Expand Down
Loading