Skip to content

Commit

Permalink
Merge pull request #195 from bluenote10/use_consistent_symbol_for_win…
Browse files Browse the repository at this point in the history
…it_window

Use consistent symbol to refer to winit window
  • Loading branch information
ecton authored Oct 22, 2024
2 parents 513d495 + ce836b2 commit 9cf93b2
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/window.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ use kludgine::app::winit::event::{
use kludgine::app::winit::keyboard::{
Key, KeyLocation, ModifiersState, NamedKey, NativeKeyCode, PhysicalKey, SmolStr,
};
use kludgine::app::winit::window::{self, Cursor, Fullscreen, Icon, WindowButtons, WindowLevel};
use kludgine::app::winit::window::{Cursor, Fullscreen, Icon, WindowButtons, WindowLevel};
use kludgine::app::{winit, WindowAttributes, WindowBehavior as _};
use kludgine::cosmic_text::{fontdb, Family, FamilyOwned};
use kludgine::drawing::Drawing;
Expand Down Expand Up @@ -3177,16 +3177,16 @@ impl Not for ThemeMode {
}
}

impl From<window::Theme> for ThemeMode {
fn from(value: window::Theme) -> Self {
impl From<winit::window::Theme> for ThemeMode {
fn from(value: winit::window::Theme) -> Self {
match value {
window::Theme::Light => Self::Light,
window::Theme::Dark => Self::Dark,
winit::window::Theme::Light => Self::Light,
winit::window::Theme::Dark => Self::Dark,
}
}
}

impl From<ThemeMode> for window::Theme {
impl From<ThemeMode> for winit::window::Theme {
fn from(value: ThemeMode) -> Self {
match value {
ThemeMode::Light => Self::Light,
Expand Down

0 comments on commit 9cf93b2

Please sign in to comment.