search

shpaass / yafc-ce

Powerful Factorio calculator/analyser that works with mods
GNU General Public License v3.0
40 stars 15 forks source link

Save window size in preferences #166

Closed DaleStan closed 4 weeks ago

DaleStan commented 1 month ago

162 motivated me to finish this feature: Yafc will now remember the size of the window and whether or not it was maximized, and use that same state the next time you run the application.

shpaass commented 4 weeks ago

Thank you for your contribution!

I see the following things that can be improved.

shpaass commented 4 weeks ago

Aaaallllrighty, I screwed up the rebase, now I need to unscrew it. Working on that.

shpaass commented 4 weeks ago

For the record, the command that I used was git rebase -i 8c549b22^ when at the head of DaleStan:save-window-size-in-preferences with git commit --allow-empty for 9fba647... Rebuild the full UI when the window is resized. (#163) when prompted.

shpaass commented 4 weeks ago

Okay, screw it. I'll update the branch to the current master, and then cherry-pick the needed commit on top.

veger commented 4 weeks ago

In order to rebase a branch on top for another branch (the master branch in this case), I always use git rebase --ont=master <first commit of the feature branch>^

Git then rebases all commits from <first commit> to HEAD on top of `master.

This can still be done if you know the original <first commit>. Which I happen to know, as I have it locally checked out right now: 5a57e50f408a04d2cffa6dde8a0cd53ae07a3903

So a git rebase --onto=master 5a57e50f408a04d2cffa6dde8a0cd53ae07a3903^ should fix all.

Edit I tried (just to be sure) and indeed it fixes all, no idea if I have pushing rights to forked branches. So I won't push to here.

shpaass commented 4 weeks ago

I tried and indeed it fixes all

If you did it in Dale's repo, then props to you. From what I saw, the master branch in his repo is different from the master of our fork, so I'm not sure if rebasing on top of it would fix stuff. What I did is fetching our master, hard resetting on it for this branch, and then cherry picking the sole commit with the changes.

shpaass commented 4 weeks ago

Leaving the part of adding a changelog entry to you guys :D

veger commented 4 weeks ago

I used a git fetch upstream pull/166/head:<local branch name> to fetch the branch for this PR. No idea in whose repo it is TBH :wink: