RE ADD CONTEXT
This commit is contained in:
@@ -1,42 +1,34 @@
|
||||
use crate::{default::UiState, prelude::*};
|
||||
use crate::prelude::*;
|
||||
use std::time::{Duration, Instant};
|
||||
use winit::dpi::{LogicalPosition, LogicalSize};
|
||||
|
||||
pub struct Selector;
|
||||
|
||||
impl<W: Widget + 'static> WidgetAttr<W> for Selector {
|
||||
type Input = WidgetRef<TextEdit>;
|
||||
impl<State: HasUiState, W: Widget<State> + 'static> WidgetAttr<State, W> for Selector {
|
||||
type Input = WidgetRef<State, TextEdit<State>>;
|
||||
|
||||
fn run(ui: &mut Ui, container: WidgetRef<W>, id: Self::Input) {
|
||||
fn run(ui: &mut Ui<State>, container: WidgetRef<State, W>, id: Self::Input) {
|
||||
ui.register_event(container, CursorSense::click_or_drag(), move |ctx| {
|
||||
let region = ctx.ui.window_region(&id).unwrap();
|
||||
let region = ctx.state.ui().window_region(&id).unwrap();
|
||||
let id_pos = region.top_left;
|
||||
let container_pos = ctx.ui.window_region(&container).unwrap().top_left;
|
||||
let container_pos = ctx.state.ui().window_region(&container).unwrap().top_left;
|
||||
let pos = ctx.data.pos + container_pos - id_pos;
|
||||
let size = region.size();
|
||||
select(
|
||||
ctx.ui,
|
||||
id,
|
||||
ctx.state,
|
||||
pos,
|
||||
size,
|
||||
ctx.data.sense.is_dragging(),
|
||||
);
|
||||
select(ctx.state, id, pos, size, ctx.data.sense.is_dragging());
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
pub struct Selectable;
|
||||
|
||||
impl WidgetAttr<TextEdit> for Selectable {
|
||||
impl<State: HasUiState> WidgetAttr<State, TextEdit<State>> for Selectable {
|
||||
type Input = ();
|
||||
|
||||
fn run(ui: &mut Ui, id: WidgetRef<TextEdit>, _: Self::Input) {
|
||||
fn run(ui: &mut Ui<State>, id: WidgetRef<State, TextEdit<State>>, _: Self::Input) {
|
||||
ui.register_event(id, CursorSense::click_or_drag(), move |ctx| {
|
||||
select(
|
||||
ctx.ui,
|
||||
id,
|
||||
ctx.state,
|
||||
id,
|
||||
ctx.data.pos,
|
||||
ctx.data.size,
|
||||
ctx.data.sense.is_dragging(),
|
||||
@@ -45,24 +37,23 @@ impl WidgetAttr<TextEdit> for Selectable {
|
||||
}
|
||||
}
|
||||
|
||||
fn select(
|
||||
ui: &mut Ui,
|
||||
id: WidgetRef<TextEdit>,
|
||||
state: &mut UiState,
|
||||
fn select<State: 'static + HasUiState>(
|
||||
state: &mut State,
|
||||
id: WidgetRef<State, TextEdit<State>>,
|
||||
pos: Vec2,
|
||||
size: Vec2,
|
||||
dragging: bool,
|
||||
) {
|
||||
let now = Instant::now();
|
||||
let recent = (now - state.last_click) < Duration::from_millis(300);
|
||||
state.last_click = now;
|
||||
id.edit(ui).select(pos, size, dragging, recent);
|
||||
if let Some(region) = ui.window_region(&id) {
|
||||
state.window.set_ime_allowed(true);
|
||||
state.window.set_ime_cursor_area(
|
||||
let recent = (now - state.ui_state().last_click) < Duration::from_millis(300);
|
||||
state.ui_state().last_click = now;
|
||||
id.edit(state.ui()).select(pos, size, dragging, recent);
|
||||
if let Some(region) = state.ui().window_region(&id) {
|
||||
state.ui_state().window.set_ime_allowed(true);
|
||||
state.ui_state().window.set_ime_cursor_area(
|
||||
LogicalPosition::<f32>::from(region.top_left.tuple()),
|
||||
LogicalSize::<f32>::from(region.size().tuple()),
|
||||
);
|
||||
}
|
||||
state.focus = Some(id);
|
||||
state.ui_state().focus = Some(id);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user