Fixes
This commit is contained in:
parent
0bbb6c0f25
commit
9250d1bb0d
3 changed files with 5 additions and 5 deletions
|
@ -32,6 +32,7 @@ use util::{ResultExt, debug_panic};
|
||||||
|
|
||||||
#[cfg(any(feature = "inspector", debug_assertions))]
|
#[cfg(any(feature = "inspector", debug_assertions))]
|
||||||
use crate::InspectorElementRegistry;
|
use crate::InspectorElementRegistry;
|
||||||
|
use crate::colors::{Colors, GlobalColors};
|
||||||
use crate::{
|
use crate::{
|
||||||
Action, ActionBuildError, ActionRegistry, Any, AnyView, AnyWindowHandle, AppContext, Asset,
|
Action, ActionBuildError, ActionRegistry, Any, AnyView, AnyWindowHandle, AppContext, Asset,
|
||||||
AssetSource, BackgroundExecutor, Bounds, ClipboardItem, CursorStyle, DispatchPhase, DisplayId,
|
AssetSource, BackgroundExecutor, Bounds, ClipboardItem, CursorStyle, DispatchPhase, DisplayId,
|
||||||
|
@ -39,10 +40,8 @@ use crate::{
|
||||||
Keymap, Keystroke, LayoutId, Menu, MenuItem, OwnedMenu, PathPromptOptions, Pixels, Platform,
|
Keymap, Keystroke, LayoutId, Menu, MenuItem, OwnedMenu, PathPromptOptions, Pixels, Platform,
|
||||||
PlatformDisplay, PlatformKeyboardLayout, Point, PromptBuilder, PromptButton, PromptHandle,
|
PlatformDisplay, PlatformKeyboardLayout, Point, PromptBuilder, PromptButton, PromptHandle,
|
||||||
PromptLevel, Render, RenderImage, RenderablePromptHandle, Reservation, ScreenCaptureSource,
|
PromptLevel, Render, RenderImage, RenderablePromptHandle, Reservation, ScreenCaptureSource,
|
||||||
SubscriberSet, Subscription, SvgRenderer, Task, TextSystem, WaylandClient, Window,
|
SubscriberSet, Subscription, SvgRenderer, Task, TextSystem, Window, WindowAppearance,
|
||||||
WindowAppearance, WindowHandle, WindowId, WindowInvalidator,
|
WindowHandle, WindowId, WindowInvalidator, current_platform, hash, init_app_menus,
|
||||||
colors::{Colors, GlobalColors},
|
|
||||||
current_platform, hash, init_app_menus,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
mod async_context;
|
mod async_context;
|
||||||
|
|
|
@ -353,7 +353,7 @@ impl WaylandClientStatePtr {
|
||||||
}
|
}
|
||||||
changed
|
changed
|
||||||
} else {
|
} else {
|
||||||
let changed: bool = &UNKNOWN_KEYBOARD_LAYOUT_NAME != state.keyboard_layout.name();
|
let changed = &UNKNOWN_KEYBOARD_LAYOUT_NAME != state.keyboard_layout.name();
|
||||||
if changed {
|
if changed {
|
||||||
state.keyboard_layout = LinuxKeyboardLayout::new(UNKNOWN_KEYBOARD_LAYOUT_NAME);
|
state.keyboard_layout = LinuxKeyboardLayout::new(UNKNOWN_KEYBOARD_LAYOUT_NAME);
|
||||||
}
|
}
|
||||||
|
|
|
@ -162,6 +162,7 @@ pub(crate) struct MacPlatformState {
|
||||||
metadata_pasteboard_type: id,
|
metadata_pasteboard_type: id,
|
||||||
reopen: Option<Box<dyn FnMut()>>,
|
reopen: Option<Box<dyn FnMut()>>,
|
||||||
on_keyboard_layout_change: Option<Box<dyn FnMut()>>,
|
on_keyboard_layout_change: Option<Box<dyn FnMut()>>,
|
||||||
|
quit_when_last_window_closes: bool,
|
||||||
quit: Option<Box<dyn FnMut()>>,
|
quit: Option<Box<dyn FnMut()>>,
|
||||||
menu_command: Option<Box<dyn FnMut(&dyn Action)>>,
|
menu_command: Option<Box<dyn FnMut(&dyn Action)>>,
|
||||||
validate_menu_command: Option<Box<dyn FnMut(&dyn Action) -> bool>>,
|
validate_menu_command: Option<Box<dyn FnMut(&dyn Action) -> bool>>,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue