From 9c070ecb8e1805f72ad37e79132866c929e53db2 Mon Sep 17 00:00:00 2001 From: Jason Dagit Date: Sun, 31 Jul 2022 19:27:11 -0700 Subject: [PATCH 1/2] Fix imports --- examples/custom_image_drawing.rs | 6 +++--- examples/webview_custom_protocol.rs | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/custom_image_drawing.rs b/examples/custom_image_drawing.rs index d4c4516..9928020 100644 --- a/examples/custom_image_drawing.rs +++ b/examples/custom_image_drawing.rs @@ -6,9 +6,9 @@ use cacao::layout::{Layout, LayoutConstraint}; use cacao::view::View; use cacao::image::{DrawConfig, Image, ImageView}; -use cacao::macos::menu::{Menu, MenuItem}; -use cacao::macos::window::Window; -use cacao::macos::{App, AppDelegate}; +use cacao::appkit::menu::{Menu, MenuItem}; +use cacao::appkit::window::Window; +use cacao::appkit::{App, AppDelegate}; struct BasicApp { window: Window, diff --git a/examples/webview_custom_protocol.rs b/examples/webview_custom_protocol.rs index db12cb9..1313604 100644 --- a/examples/webview_custom_protocol.rs +++ b/examples/webview_custom_protocol.rs @@ -3,10 +3,10 @@ use cacao::webview::{WebView, WebViewConfig, WebViewDelegate}; -use cacao::macos::menu::{Menu, MenuItem}; -use cacao::macos::toolbar::Toolbar; -use cacao::macos::window::{Window, WindowConfig, WindowDelegate, WindowToolbarStyle}; -use cacao::macos::{App, AppDelegate}; +use cacao::appkit::menu::{Menu, MenuItem}; +use cacao::appkit::toolbar::Toolbar; +use cacao::appkit::window::{Window, WindowConfig, WindowDelegate, WindowToolbarStyle}; +use cacao::appkit::{App, AppDelegate}; struct BasicApp { window: Window From 8accde647812b24a33d2bd810debbe690f964c87 Mon Sep 17 00:00:00 2001 From: Jason Dagit Date: Sun, 31 Jul 2022 20:09:59 -0700 Subject: [PATCH 2/2] fix formatting --- examples/custom_image_drawing.rs | 7 ++++--- examples/webview_custom_protocol.rs | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/examples/custom_image_drawing.rs b/examples/custom_image_drawing.rs index 9928020..8dc6bee 100644 --- a/examples/custom_image_drawing.rs +++ b/examples/custom_image_drawing.rs @@ -1,14 +1,15 @@ //! This example showcases how to do custom drawing on an ImageView //! with CoreGraphics. Feel free to modify it and play around! +use cacao::appkit::menu::{Menu, MenuItem}; +use cacao::appkit::window::Window; +use cacao::appkit::{App, AppDelegate}; + use cacao::color::Color; use cacao::layout::{Layout, LayoutConstraint}; use cacao::view::View; use cacao::image::{DrawConfig, Image, ImageView}; -use cacao::appkit::menu::{Menu, MenuItem}; -use cacao::appkit::window::Window; -use cacao::appkit::{App, AppDelegate}; struct BasicApp { window: Window, diff --git a/examples/webview_custom_protocol.rs b/examples/webview_custom_protocol.rs index 1313604..7b326a8 100644 --- a/examples/webview_custom_protocol.rs +++ b/examples/webview_custom_protocol.rs @@ -1,13 +1,13 @@ //! This example showcases setting up a basic application and window, setting up some views to //! work with autolayout, and some basic ways to handle colors. -use cacao::webview::{WebView, WebViewConfig, WebViewDelegate}; - use cacao::appkit::menu::{Menu, MenuItem}; use cacao::appkit::toolbar::Toolbar; use cacao::appkit::window::{Window, WindowConfig, WindowDelegate, WindowToolbarStyle}; use cacao::appkit::{App, AppDelegate}; +use cacao::webview::{WebView, WebViewConfig, WebViewDelegate}; + struct BasicApp { window: Window }