Untangle zoom when in TextEdit
Addresses ([#140])
I don't think the zoom code in handle_key_events was necessary because
gui zooming already appears to be handled by egui::gui_zoom.
Description of keybindings:
59d71831fd/crates/egui/src/gui_zoom.rs (L5-L26)
Zooming using the described keybindings works fine with a textedit
focused.
This PR removes the ContextAction::SetPixelsPerPoint aggressively;
maybe it should remain for other future uses?
This commit is contained in:
35
src/app.rs
35
src/app.rs
@@ -184,35 +184,13 @@ fn send_initial_filters(damus: &mut Damus, relay_url: &str) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
enum ContextAction {
|
fn handle_key_events(input: &egui::InputState, _pixels_per_point: f32, columns: &mut Columns) {
|
||||||
SetPixelsPerPoint(f32),
|
|
||||||
}
|
|
||||||
|
|
||||||
fn handle_key_events(
|
|
||||||
input: &egui::InputState,
|
|
||||||
pixels_per_point: f32,
|
|
||||||
columns: &mut Columns,
|
|
||||||
) -> Option<ContextAction> {
|
|
||||||
let amount = 0.2;
|
|
||||||
|
|
||||||
// We can't do things like setting the pixels_per_point when we are holding
|
|
||||||
// on to an locked InputState context, so we need to pass actions externally
|
|
||||||
let mut context_action: Option<ContextAction> = None;
|
|
||||||
|
|
||||||
for event in &input.raw.events {
|
for event in &input.raw.events {
|
||||||
if let egui::Event::Key {
|
if let egui::Event::Key {
|
||||||
key, pressed: true, ..
|
key, pressed: true, ..
|
||||||
} = event
|
} = event
|
||||||
{
|
{
|
||||||
match key {
|
match key {
|
||||||
egui::Key::Equals => {
|
|
||||||
context_action =
|
|
||||||
Some(ContextAction::SetPixelsPerPoint(pixels_per_point + amount));
|
|
||||||
}
|
|
||||||
egui::Key::Minus => {
|
|
||||||
context_action =
|
|
||||||
Some(ContextAction::SetPixelsPerPoint(pixels_per_point - amount));
|
|
||||||
}
|
|
||||||
egui::Key::J => {
|
egui::Key::J => {
|
||||||
columns.select_down();
|
columns.select_down();
|
||||||
}
|
}
|
||||||
@@ -229,20 +207,11 @@ fn handle_key_events(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
context_action
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn try_process_event(damus: &mut Damus, ctx: &egui::Context) -> Result<()> {
|
fn try_process_event(damus: &mut Damus, ctx: &egui::Context) -> Result<()> {
|
||||||
let ppp = ctx.pixels_per_point();
|
let ppp = ctx.pixels_per_point();
|
||||||
let res = ctx.input(|i| handle_key_events(i, ppp, &mut damus.columns));
|
ctx.input(|i| handle_key_events(i, ppp, &mut damus.columns));
|
||||||
if let Some(action) = res {
|
|
||||||
match action {
|
|
||||||
ContextAction::SetPixelsPerPoint(amt) => {
|
|
||||||
ctx.set_pixels_per_point(amt);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let ctx2 = ctx.clone();
|
let ctx2 = ctx.clone();
|
||||||
let wakeup = move || {
|
let wakeup = move || {
|
||||||
|
|||||||
Reference in New Issue
Block a user