godot
godot copied to clipboard
godotengine
Add text editor minimap customization
Minimap (line spacing and line scaling) Feature
Added feature that allows us to edit the line spacing and line scale of the Minimap.
https://github.com/godotengine/godot/assets/90724319/5e2a5e1c-e3ca-4d3c-8c79-0dfd3f9985b1
Why?
The current minimap in Godot is tiny and small.. This PR increased the default size and allows for customization to look more visually appealing.
Commit Squashing always creates a Merge Commit rather than a normal commit.. is that normal? or am I doing something wrong?
(Every time I fix my workflows errors and commit the changes and squash them it does that.)
Commit Squashing always creates a Merge Commit rather than a normal commit.. is that normal? or am I doing something wrong?
You need to push with git push -f to avoid the merge commits, you need to remove any such commits when squashing
You can always fix a PR by resetting your branch, you don't need to close the old ones, please avoid that as it clutters the tracker, if you need help to fix anything please ask
You can always fix a PR by resetting your branch, you don't need to close the old ones, please avoid that as it clutters the tracker, if you need help to fix anything please ask
Thank you I wasn't aware I'll definitely try that from now.. Thanks
@AThousandShips Not sure if I'm correct but is the Check GHA/Linux/Editor w/ Mono (target=editor), failing because the <member>...</member> entries need to be sorted in alphabetical order?
Yes, please run --doctool on the compiled editor to fix it automatically
Yes, please run
--doctoolon the compiled editor to fix it automatically
Note sure I know where to go to do that.. mind showing me how to navigate to the compiled editor? or do I have to do it locally on my machine?
You merged your branch again, please use git push -f instead of merging, fix this by:
git reset --hard 80e3694
git push -f
Your computer is also configured weirdly so your commits are from the past, please check that your computer clock isn't off
You will need to fix the order again you must have removed those changes
You merged your branch again, please use
git push -finstead of merging, fix this by:git reset --hard 80e3694 git push -fYour computer is also configured weirdly so your commits are from the past, please check that your computer clock isn't off
so to remove commit 80e3694 and be left with 9d44821
I have to run:
git reset --hard 9d44821 ?
You're good now, this was to drop the merge commit before
But no it's backwards, if you want to drop 9d44821 and only keep 80e3694 you'd call git reset --hard 80e3694, it goes back in the chain of commits
Once the CI has finished you can squash the commits, remember to use git push -f
FINALLY! @AThousandShips Thank you very much for your patience! Truly Appreciated once again 🥇 !!
It's a thing that takes time to get right, I struggled myself when I started out
It's a thing that takes time to get right, I struggled myself when I started out
Indeed! Now I will be able to do Future PR's with less hiccups.. Gracias!
I have the exact opposite grievance with minimap. For me, the minimap is a way to jump to relevant sections of big scripts in a cleaner matter than with the scrollbar. I think VSCode's default is wayy better, as it's way tighter, allowing to scroll to more of the script at once.
VSCode default:
This isn't against the PR, I'd have liked to discuss this in a proposal but one wasn't made. I just hope we don't bet too hard on our current approach, to where it'd be hard to avoid compat-breaking in the future.
I have the exact opposite grievance with minimap. For me, the minimap is a way to jump to relevant sections of big scripts in a cleaner matter than with the scrollbar. I think VSCode's default is wayy better, as it's way tighter, allowing to scroll to more of the script at once.
Well in Essence The PR doesn't enforce a certain zoom level but rather allows you to customize it to your need. Thus if you would like the VScode default style you can simply set it and adjust it rather then have it permanently imposed on everyone who would prefer a different style.
So you would still be able to click an navigate to certain parts of the code as you would like based on your preference.
Maybe it should be floats instead of ints for more control over the size?
Yes that's exactly what I had in mind, since we do lose some precision when we divide integers
You seem to have broken things by reverting changes, please rebase your branch to fix this
Please use the rebase function in the command line instead, using the GitHub method probably caused something to break, use git rebase master instead
I get a : Successfully rebased and updated refs/heads/Add-Minimap-Customization.
so do I git push -f ? or
Yes always use git push -f when you've altered the history, which you can see when you do git status and it says "have diverged" or similar