[wicket] add page up/page down/home/end to the keymap #3692
Conversation
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
Created using spr 1.3.4
sunshowers
commented
Jul 18, 2023
Comment on lines
-204
to
+227
| /// Returns the effective, or actual, scroll kind after the text is laid | ||
| /// out. | ||
| /// | ||
| /// If this is a `PopupScrollKind::Enabled` popup, the offset is is capped | ||
| /// to the maximum degree to which text can be scrolled. | ||
| pub fn actual_scroll_kind(&self) -> PopupScrollKind { | ||
| self.actual_scroll_kind | ||
| } | ||
| /// Returns the maximum width that this popup can have, including outer | ||
| /// borders. | ||
| /// | ||
| /// This is currently 80% of screen width. | ||
| pub fn popup_max_width(full_screen_width: u16) -> u16 { | ||
| (full_screen_width as u32 * 4 / 5) as u16 | ||
| } | ||
|
|
||
| /// Returns the maximum width that this popup can have, including outer | ||
| /// borders. | ||
| /// | ||
| /// This is currently 80% of screen width. | ||
| pub fn max_width(full_screen_width: u16) -> u16 { | ||
| (full_screen_width as u32 * 4 / 5) as u16 | ||
| } | ||
| /// Returns the maximum width that this popup can have, not including outer | ||
| /// borders. | ||
| pub fn popup_max_content_width(full_screen_width: u16) -> u16 { | ||
| // -2 for borders, -2 for padding | ||
| popup_max_width(full_screen_width).saturating_sub(4) | ||
| } | ||
|
|
||
| /// Returns the maximum width that this popup can have, not including outer | ||
| /// borders. | ||
| pub fn max_content_width(full_screen_width: u16) -> u16 { | ||
| // -2 for borders, -2 for padding | ||
| Self::max_width(full_screen_width).saturating_sub(4) | ||
| } | ||
| /// Returns the maximum height that this popup can have, including outer | ||
| /// borders. | ||
| /// | ||
| /// This is currently 80% of screen height. | ||
| pub fn popup_max_height(full_screen_height: u16) -> u16 { | ||
| (full_screen_height as u32 * 4 / 5) as u16 | ||
| } | ||
|
|
||
| /// Returns the maximum height that this popup can have, including outer | ||
| /// borders. | ||
| /// | ||
| /// This is currently 80% of screen height. | ||
| pub fn max_height(full_screen_height: u16) -> u16 { | ||
| (full_screen_height as u32 * 4 / 5) as u16 | ||
| /// Returns the wrap options that should be used in most cases for popups. | ||
| fn default_wrap_options( | ||
| full_screen_width: u16, | ||
| ) -> crate::ui::wrap::Options<'static> { | ||
| crate::ui::wrap::Options { | ||
| width: popup_max_content_width(full_screen_width) as usize, | ||
| // The indent here is to add 1 character of padding. | ||
| initial_indent: Span::raw(" "), | ||
| subsequent_indent: Span::raw(" "), | ||
| break_words: true, | ||
| } | ||
| } |
Contributor
Author
There was a problem hiding this comment.
These were moved outside Popup since it gained a type parameter -- static methods are annoying on structs with type parameters since you have to specify a concrete type even though it isn't relevant.
jgallagher
approved these changes
Aug 29, 2023
Contributor
jgallagher
left a comment
jgallagher
left a comment
There was a problem hiding this comment.
Sorry for the long delay on this review 😬
wicket/src/ui/panes/overview.rs
Outdated
|
|
||
| let popup_builder = | ||
| self.ignition.to_popup_builder(state.rack_state.selected); | ||
| // Scrolling in the ignition popup is always disabled. |
Contributor
There was a problem hiding this comment.
Nit - this comment should probably be removed too, since the variant it was referencing is gone.
| self.ignition.to_popup_builder(state.rack_state.selected); | ||
|
|
||
| // The scroll offset here should always be disabled, but make it a | ||
| // parameter for uniformity with the other popups. |
Contributor
There was a problem hiding this comment.
Nice to be able to delete this 👍
Created using spr 1.3.4
sunshowers
deleted the
sunshowers/spr/wicket-add-page-uppage-downhomeend-to-the-keymap
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Model this with a new
PendingScrollaction stored on the view. Thisaction is resolved at draw time.
This ended up bundling several more changes (sorry!):
off previously, whoops :(
@jgallagher created while writing the rack setup screen. Previously,
we were storing a single scroll state at the top. This was actually
incorrect because when we moved from "waiting" to "failed", we weren't
setting the scroll state to Some. The new model stores scroll state
inline, and is correct as a result.
popups -- I made a couple of mistakes with unwrapping scroll popup
state which this caught.
I tested all the screens which support scrolling, and it worked great
on all of them.
Closes #3653.