Movable menu windows - #42
Conversation
morganchristiansson
commented
Jun 20, 2026
morganchristiansson
commented
- Make Menu, Save, Load windows movable.
- Make Load window resizable and filelist resize with window size.
- Filter Load filelist on known filetypes.
- Make Save inputs same width.
|
I have a large .png heightmap in the save folder, loading it causes OOM and kills a bunch of applications. Very annoying. I also added items to main menu in another branch and it's annoying to not be able to move it out of the way. |
23c94df to
e459607
Compare
I don't understand how this is related to this PR. Can you explain please? |
"Filter Load filelist on known filetypes" stops "Load map" from accidentally loading unsupported filetypes and crashing on OOM. |
52075ad to
05e5bc4
Compare
|
conflict to resolve |
|
conflicts = progress! Idk if I should rebase or squash this branch before merge, it has multiple merge commits, I'd be happy to do so, ensuring empty diff against reviewed commit pointer, and force push. |
|
rebase is always good (still having conflicts btw) |
|
Yeah just force pushing during review can mess things up for reviewers, so once review starts I stop rebasing&force pushing. Unless coordinated with reviewers. How can you say there's conflicts? I just merged latest upstream/master and PR says no conflicts with base branch. |
Addresses PR feedback: s25util has toLower so the string can be const.
4d017a3 to
60a2aaa
Compare
|
Rebased. |
That is exactly the way to go, thanks!
I disagree here (see e.g. above) as often the argument for rebase vs. (possibly frequent) merges of main is that it "looks odd" which doesn't matter to me as long as git easily handles it. |
|
Btw I really enjoy the craft of creating a perfect series of commits for review and hate the squash on merge feature. Tho some people have no idea what they're doing with git and their PRs are best squashed on merge. |
…Roots#42 Position API After rebasing the feature branch onto upstream master (which merged PR Return-To-The-Roots#40 xy-point-extent and PR Return-To-The-Roots#42 menu-windows), several files had stale int-based API calls/definitions that conflicted with the new Position/Extent API: - CGame.h: add missing enterEditor/LoadSettings/SaveSettings declarations and suppressResizeEvents_ member (implemented in CGame.cpp from the resizable-window commit but omitted from the header during rebase) - globals.h: add TRIANGLE_HEIGHT/WIDTH/INCREASE macro aliases for the lowercase mutable globals used by CGame_Event.cpp and CSurface.cpp - CSurface.cpp: restore Position-based signatures for Draw, DrawPixel_*, GetPixel, update_shading, update_flatVectors, update_nodeVector to match CSurface.h (PR Return-To-The-Roots#42 API); keep the tiling additions (floorDiv, drawTriangleTiled, new DrawTriangleField loop) from the resizable commit - callbacks.cpp: rebuild EditorLoadMenu folder navigation on top of the PR Return-To-The-Roots#42 Position API (no int-based addText/addButton calls)
3 participants
