Merge branch 'ryanmcgrath:trunk' into ci-build-examples

This commit is contained in:
Jason Dagit 2022-07-31 20:16:15 -07:00 committed by GitHub
commit c4b71b729d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions

View file

@ -1,14 +1,15 @@
//! This example showcases how to do custom drawing on an ImageView //! This example showcases how to do custom drawing on an ImageView
//! with CoreGraphics. Feel free to modify it and play around! //! 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::color::Color;
use cacao::layout::{Layout, LayoutConstraint}; use cacao::layout::{Layout, LayoutConstraint};
use cacao::view::View; use cacao::view::View;
use cacao::image::{DrawConfig, Image, ImageView}; use cacao::image::{DrawConfig, Image, ImageView};
use cacao::macos::menu::{Menu, MenuItem};
use cacao::macos::window::Window;
use cacao::macos::{App, AppDelegate};
struct BasicApp { struct BasicApp {
window: Window, window: Window,

View file

@ -1,12 +1,12 @@
//! This example showcases setting up a basic application and window, setting up some views to //! 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. //! 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::macos::menu::{Menu, MenuItem}; use cacao::webview::{WebView, WebViewConfig, WebViewDelegate};
use cacao::macos::toolbar::Toolbar;
use cacao::macos::window::{Window, WindowConfig, WindowDelegate, WindowToolbarStyle};
use cacao::macos::{App, AppDelegate};
struct BasicApp { struct BasicApp {
window: Window<AppWindow> window: Window<AppWindow>