Fix off-by-one error when calculating popup panel dimensions#5312
Merged
Conversation
Coverage summary from CodacySee diff coverage on Codacy
Coverage variation details
Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: Diff coverage details
Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: See your quality gate settings Change summary preferencesFootnotes
|
skdas20
added a commit
to skdas20/lazygit
that referenced
this pull request
Feb 22, 2026
fa6f3ea to
1b6c3ef
Compare
The symptom of the bug was that confirmation panels with wrapped text were one character too wide, which could sometimes result in them being one line too heigh. One concrete example is the "Discard file changes" confirmation that appears when pressing `d` in the commit files panel. I got very confused when investigating this bug, and the reason is that getPopupPanelDimensionsAux took two parameters panelWidth and panelHeight, but the second was actually contentHeight. Rename it to contentHeight, and change the first one to also be the content width rather than the panel width. This is easier for clients, and less confusing.
I got confused when I investigated the bug that was fixed in the previous commit, so hopefully these will be helpful for the next person reading this code.
1b6c3ef to
da065b5
Compare
tmeijn
pushed a commit
to tmeijn/dotfiles
that referenced
this pull request
Mar 24, 2026
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [jesseduffield/lazygit](https://github.com/jesseduffield/lazygit) | minor | `v0.59.0` → `v0.60.0` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>jesseduffield/lazygit (jesseduffield/lazygit)</summary> ### [`v0.60.0`](https://github.com/jesseduffield/lazygit/releases/tag/v0.60.0) [Compare Source](jesseduffield/lazygit@v0.59.0...v0.60.0) <!-- Release notes generated using configuration in .github/release.yml at v0.60.0 --> #### What's Changed ##### Enhancements 🔥 - Rename "Copy commit hash to clipboard" to mention it's an abbreviated hash by [@​stefanhaller](https://github.com/stefanhaller) in [#​5331](jesseduffield/lazygit#5331) - Hide the "Fetching..." status of the auto-fetch when bottom line is hidden by [@​stefanhaller](https://github.com/stefanhaller) in [#​5321](jesseduffield/lazygit#5321) - Allow removing lines from patch directly by [@​jesseduffield](https://github.com/jesseduffield) in [#​5277](jesseduffield/lazygit#5277) - Filter file views rather than search by [@​jesseduffield](https://github.com/jesseduffield) in [#​5273](jesseduffield/lazygit#5273) - Show branch name and detached HEAD in worktrees tab by [@​ruudk](https://github.com/ruudk) in [#​5339](jesseduffield/lazygit#5339) - Add backward cycling support for log view (using `<shift>-a` on status page) by [@​zaakiy](https://github.com/zaakiy) in [#​5346](jesseduffield/lazygit#5346) - Show worktree name next to branch in branches list by [@​ruudk](https://github.com/ruudk) in [#​5340](jesseduffield/lazygit#5340) ##### Fixes 🔧 - Fix matching of lazygit-edit URLs without line numbers by [@​danielwe](https://github.com/danielwe) in [#​5311](jesseduffield/lazygit#5311) - Fix [#​5302](jesseduffield/lazygit#5302): Create .git/info directory before writing exclude file by [@​cobyfrombrooklyn-bot](https://github.com/cobyfrombrooklyn-bot) in [#​5325](jesseduffield/lazygit#5325) - Fix off-by-one error when calculating popup panel dimensions by [@​stefanhaller](https://github.com/stefanhaller) in [#​5312](jesseduffield/lazygit#5312) - Properly disable clicks in inactive views behind popups by [@​stefanhaller](https://github.com/stefanhaller) in [#​5313](jesseduffield/lazygit#5313) - Enable `{` and `}` to change diff context size in branches and tags panels in diffing mode by [@​stefanhaller](https://github.com/stefanhaller) in [#​5258](jesseduffield/lazygit#5258) - Fix diff display of custom pagers after screen mode change by [@​stefanhaller](https://github.com/stefanhaller) in [#​5349](jesseduffield/lazygit#5349) ##### Maintenance ⚙️ - Bump github.com/cloudflare/circl from 1.6.1 to 1.6.3 by [@​dependabot](https://github.com/dependabot)\[bot] in [#​5323](jesseduffield/lazygit#5323) ##### Docs 📖 - Fix typo: MacOS to macOS by [@​04cb](https://github.com/04cb) in [#​5335](jesseduffield/lazygit#5335) ##### I18n 🌎 - Update translations from Crowdin by [@​stefanhaller](https://github.com/stefanhaller) in [#​5352](jesseduffield/lazygit#5352) ##### Other Changes - Add Terra as an alternative Fedora install method by [@​Owen-sz](https://github.com/Owen-sz) in [#​5281](jesseduffield/lazygit#5281) #### New Contributors - [@​Owen-sz](https://github.com/Owen-sz) made their first contribution in [#​5281](jesseduffield/lazygit#5281) - [@​danielwe](https://github.com/danielwe) made their first contribution in [#​5311](jesseduffield/lazygit#5311) - [@​cobyfrombrooklyn-bot](https://github.com/cobyfrombrooklyn-bot) made their first contribution in [#​5325](jesseduffield/lazygit#5325) - [@​04cb](https://github.com/04cb) made their first contribution in [#​5335](jesseduffield/lazygit#5335) - [@​zaakiy](https://github.com/zaakiy) made their first contribution in [#​5346](jesseduffield/lazygit#5346) **Full Changelog**: <jesseduffield/lazygit@v0.59.0...v0.60.0> </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My42MS43IiwidXBkYXRlZEluVmVyIjoiNDMuNjEuNyIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiUmVub3ZhdGUgQm90IiwiYXV0b21hdGlvbjpib3QtYXV0aG9yZWQiLCJkZXBlbmRlbmN5LXR5cGU6Om1pbm9yIl19-->
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The symptom of the bug was that confirmation panels with wrapped text were one character too wide, which could sometimes result in them being one line too heigh. One concrete example is the "Discard file changes" confirmation that appears when pressing
din the commit files panel.