amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-13 05:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Image slice window now always uses "size to fit" as default sizing type

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-06-10 01:07:47 +02:00
parent 053449d5d4
commit 8c26eb5b47
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES.txt
+1
View File
@@ -10,6 +10,7 @@ Bug fixes:
* Fixed: keywords after atoms were not showing up (#67) * Fixed: keywords after atoms were not showing up (#67)
* Fixed: multiple keywords that matched in the same place both showed reminder text. (#70) * Fixed: multiple keywords that matched in the same place both showed reminder text. (#70)
Now, when there are overlapping matches the longest one is used. Now, when there are overlapping matches the longest one is used.
* Fixed: image slicing window now uses "size to fit" by default
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
-- 2.1.0, 2020-06-01 -- 2.1.0, 2020-06-01
src/gui/image_slice_window.cpp
+4 -2
View File
@@ -21,7 +21,7 @@ ImageSlice::ImageSlice(const Image& source, const wxSize& target_size)
: source(source), target_size(target_size) : source(source), target_size(target_size)
, selection(0, 0, source.GetWidth(), source.GetHeight()) , selection(0, 0, source.GetWidth(), source.GetHeight())
, allow_outside(false), aspect_fixed(true) , allow_outside(false), aspect_fixed(true)
, sharpen(true), sharpen_amount(25) , sharpen(false), sharpen_amount(25)
{} {}
void ImageSlice::constrain(PreferedProperty prefer) { void ImageSlice::constrain(PreferedProperty prefer) {
@@ -80,6 +80,8 @@ ImageSliceWindow::ImageSliceWindow(Window* parent, const Image& source, const wx
, slice(source, target_size) , slice(source, target_size)
, initialized(false) , initialized(false)
{ {
// init slice
slice.constrain();
// init controls // init controls
const wxPoint defPos = wxDefaultPosition; const wxPoint defPos = wxDefaultPosition;
const wxSize spinSize(80,-1); const wxSize spinSize(80,-1);
@@ -287,7 +289,7 @@ void ImageSliceWindow::updateControls() {
if (slice.selection.width == slice.target_size.GetWidth() && slice.selection.height == slice.target_size.GetHeight()) { if (slice.selection.width == slice.target_size.GetWidth() && slice.selection.height == slice.target_size.GetHeight()) {
size->SetSelection(0); // original size size->SetSelection(0); // original size
} else if (slice.selection.x == 0 && slice.selection.width == slice.source.GetWidth() && } else if (slice.selection.x == 0 && slice.selection.width == slice.source.GetWidth() &&
slice.selection.y == 0 && slice.selection.height == slice.source.GetHeight()) { slice.selection.y == 0 && slice.selection.height == slice.source.GetHeight() && !slice.aspect_fixed) {
size->SetSelection(2); // force to fit size->SetSelection(2); // force to fit
} else if (slice.selection.width <= slice.source.GetWidth() && } else if (slice.selection.width <= slice.source.GetWidth() &&
slice.selection.height <= slice.source.GetHeight() && slice.selection.height <= slice.source.GetHeight() &&