From aaf88a93b4ab80f3f9d3739c4f0ea95fdc8d8311 Mon Sep 17 00:00:00 2001 From: jackson <63016612+fairybow@users.noreply.github.com> Date: Sun, 19 Feb 2023 21:23:10 -0500 Subject: [PATCH] Touch-ups :cherry_blossom: - Removed a bad call to storeWidths in Splitter (resulting in not being able to drag open or shut and correctly recall sizes) - Updated Todo --- Fernanda/docs/To-do.md | 4 +++- Fernanda/src/Splitter.cpp | 3 +-- Fernanda/src/Version.h | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Fernanda/docs/To-do.md b/Fernanda/docs/To-do.md index ef404c4..029c97b 100644 --- a/Fernanda/docs/To-do.md +++ b/Fernanda/docs/To-do.md @@ -147,9 +147,11 @@ - [ ] Ensure popups happen on the same monitor... ### Preview -- [ ] Moving pane before preview has saved in state will override the default preview size, and so toggling it on after that will toggle it on with width 0 +- [ ] Need a default size to open to from toggle if not set (-1) +- [ ] Toggling preview on will have to trigger the above, because if never toggled on, it will toggle into existence with no width - [ ] Ink support - [ ] Print to PDF context menu +- [x] ~~While dragging a collapsed panel open will not override the saved size, dragging it closed will (remove line 149 probably and do storeWidths on mouse release, signalled by handle, instead...avoid saving periodically when dragging)~~ - [x] ~~Scrollbar should begin tied to position in editor. Can be moved independently but when snapped, scrolls with editor.~~ - [x] ~~Replace fountain CSS~~ - [x] ~~Minify fountain CSS~~ diff --git a/Fernanda/src/Splitter.cpp b/Fernanda/src/Splitter.cpp index 5ebe206..74566f4 100644 --- a/Fernanda/src/Splitter.cpp +++ b/Fernanda/src/Splitter.cpp @@ -126,7 +126,7 @@ void Splitter::storeWidths() for (auto& widget_info : widgets) { if (widget_info.state != State::Expanded) continue; - auto size = sizes().at(widget_info.index); + auto& size = sizes().at(widget_info.index); if (widget_info.width && size) widget_info.width = size; } @@ -146,7 +146,6 @@ void Splitter::toggleExpansion(SplitterHandle* handlePointer) void Splitter::checkStates(int position, int index) { - storeWidths(); for (auto& widget_info : widgets) { auto& handle_index = widget_info.handleIndex; diff --git a/Fernanda/src/Version.h b/Fernanda/src/Version.h index fdc103d..d51f70e 100644 --- a/Fernanda/src/Version.h +++ b/Fernanda/src/Version.h @@ -13,8 +13,8 @@ #pragma once -#define VER_FILEVERSION 0,24,0,49 -#define VER_FILEVERSION_STR "v0.24.0-beta49" +#define VER_FILEVERSION 0,24,1,50 +#define VER_FILEVERSION_STR "v0.24.1-beta50" #define VER_PRODUCTVERSION VER_FILEVERSION #define VER_PRODUCTVERSION_STR VER_FILEVERSION_STR #define VER_COMPANYNAME_STR "@fairybow"