Skip to content
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

Fix scaling while preserving proportions #647

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix scaling while preserving proportions #647

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 24 additions & 1 deletion src/tools/transform_tools/tool_scale.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ def on_tool_selected(self, *args):
self._spinbtns_disabled = False
self._width_btn.set_value(width)
self._height_btn.set_value(height)
self._previous_width = width
self._previous_height = height
self.build_and_do_op() # Ensure a correct preview

def _get_original_size(self):
Expand Down Expand Up @@ -166,7 +168,10 @@ def set_preserve_ratio(self, for_spinbtns=False):
if self._preserve_ratio == former_setting:
return
if self._preserve_ratio:
self._ratio = self._get_width() / self._get_height()
if for_spinbtns:
self._ratio = self._get_previous_width() / self._get_previous_height()
else:
self._ratio = self._get_width() / self._get_height()

def _try_scale_dimensions(self):
if self._reload_is_locked:
Expand Down Expand Up @@ -226,6 +231,10 @@ def on_spinbtn_changed(self, *args):
self.set_preserve_ratio(True)
self._try_scale_dimensions()

if not self._preserve_ratio:
self._previous_width = self._get_width()
self._pervious_height = self._get_height()

def on_spinbtn100_changed(self, *args):
if self._spinbtns_disabled:
return
Expand All @@ -249,13 +258,27 @@ def _apply_deltas_to_spinbtns(self, new_width, new_height, dx=0, dy=0):
else:
self._height_btn.set_value(new_height)
self._width_btn.set_value(new_width)
self._previous_height = new_height
self._previous_width = new_width

def _get_width(self):
return self._width_btn.get_value_as_int()

def _get_height(self):
return self._height_btn.get_value_as_int()

def _get_previous_width(self):
try:
return self._previous_width
finally:
self._previous_width = self._get_width()

def _get_previous_height(self):
try:
return self._previous_height
finally:
self._previous_height = self._get_height()

############################################################################

def on_unclicked_motion_on_area(self, event, surface):
Expand Down
Loading