-
Notifications
You must be signed in to change notification settings - Fork 3
fix: keep ficha and log on city screens between 64 and 90 columns (#7) #42
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
blippip69
wants to merge
1
commit into
Bitcoindefi:main
Choose a base branch
from
blippip69:fix/force-sidebar-min-width
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| const { test } = require('brittle') | ||
| const { style } = require('bare-tui') | ||
| const render = require('../lib/render.js') | ||
|
|
||
| function cityFrame(width) { | ||
| return style.stripAnsi( | ||
| render.mapScreen({ | ||
| width, | ||
| height: 20, | ||
| place: 'plaza', | ||
| stats: { hp: 9, maxhp: 12, gold: 7 }, | ||
| log: ['primer mensaje'], | ||
| cellW: 1, | ||
| map: { | ||
| tiles: ['........', '........', '........'], | ||
| actors: [], | ||
| hero: { x: 4, y: 1 } | ||
| } | ||
| }) | ||
| ) | ||
| } | ||
|
|
||
| test('the city keeps ficha and log from MIN_WIDTH up to the old cutoff (#7)', (t) => { | ||
| for (const width of [64, 70, 80, 90]) { | ||
| const frame = cityFrame(width) | ||
| t.ok(frame.includes('ficha'), `${width} columns show the sheet`) | ||
| t.ok(frame.includes('log'), `${width} columns show the log panel`) | ||
| t.ok(frame.includes('primer mensaje'), `${width} columns surface new model state`) | ||
| } | ||
| }) | ||
|
|
||
| test('below MIN_WIDTH nothing pretends to fit, and an explicit opt-out still works (#7)', (t) => { | ||
| t.ok(!cityFrame(63).includes('ficha'), '63 columns stay on the too-small screen') | ||
|
|
||
| const wide = render.mapScreen({ | ||
| width: 100, | ||
| height: 20, | ||
| place: 'plaza', | ||
| stats: {}, | ||
| log: [], | ||
| sidebar: false, | ||
| cellW: 1, | ||
| map: { tiles: ['....'], actors: [], hero: { x: 0, y: 0 } } | ||
| }) | ||
| t.ok(!style.stripAnsi(wide).includes('ficha'), 'sidebar:false keeps its escape-hatch meaning') | ||
| }) |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💡 Quality: Unused
cellWlocal variable left in mapScreenThe diff removed the
mapW/tilescalculation that was the only consumer of the localconst cellW = Math.max(1, m.cellW || CELL_W). The map pane is rendered withmapPane(m.map, w, h, { cellW: m.cellW }), which usesm.cellWdirectly and ignores the local clamped value, socellWis now dead code. Remove the line to avoid confusion (and note the clamping/CELL_Wfallback no longer applies here—if that fallback was intended for the pane, pass the localcellWtomapPaneinstead).Was this helpful? React with 👍 / 👎