fix cargo test

This commit is contained in:
Sebastian Imlay 2022-08-14 15:44:53 -04:00
parent fb9d456a5d
commit 8bffc30ac1
25 changed files with 144 additions and 67 deletions

View file

@ -2,6 +2,7 @@
//! work with autolayout, and some basic ways to handle colors.
use cacao::notification_center::Dispatcher;
#[cfg(feature = "webview")]
use cacao::webview::{WebView, WebViewConfig, WebViewDelegate};
use cacao::appkit::menu::{Menu, MenuItem};
@ -72,17 +73,20 @@ impl Dispatcher for BasicApp {
fn on_ui_message(&self, message: Self::Message) {
let window = self.window.delegate.as_ref().unwrap();
let webview = &window.content;
#[cfg(feature = "webview")]
{
let webview = &window.content;
match message {
Action::Back => {
webview.go_back();
},
Action::Forwards => {
webview.go_forward();
},
Action::Load(url) => {
window.load_url(&url);
match message {
Action::Back => {
webview.go_back();
},
Action::Forwards => {
webview.go_forward();
},
Action::Load(url) => {
window.load_url(&url);
}
}
}
}
@ -91,10 +95,12 @@ impl Dispatcher for BasicApp {
#[derive(Default)]
pub struct WebViewInstance;
#[cfg(feature = "webview")]
impl WebViewDelegate for WebViewInstance {}
struct AppWindow {
toolbar: Toolbar<BrowserToolbar>,
#[cfg(feature = "webview")]
content: WebView<WebViewInstance>
}
@ -102,12 +108,14 @@ impl AppWindow {
pub fn new() -> Self {
AppWindow {
toolbar: Toolbar::new("com.example.BrowserToolbar", BrowserToolbar::new()),
#[cfg(feature = "webview")]
content: WebView::with(WebViewConfig::default(), WebViewInstance::default())
}
}
pub fn load_url(&self, url: &str) {
self.toolbar.delegate.as_ref().unwrap().set_url(url);
#[cfg(feature = "webview")]
self.content.load_url(url);
}
}
@ -121,6 +129,7 @@ impl WindowDelegate for AppWindow {
window.set_minimum_content_size(400., 400.);
window.set_toolbar(&self.toolbar);
#[cfg(feature = "webview")]
window.set_content_view(&self.content);
self.load_url("https://www.duckduckgo.com/");

View file

@ -1,5 +1,6 @@
use std::sync::RwLock;
#[cfg(targe_os = "ios")]
use cacao::uikit::{App, AppDelegate, Scene, SceneConfig, SceneConnectionOptions, SceneSession, Window, WindowSceneDelegate};
use cacao::color::Color;
@ -9,6 +10,7 @@ use cacao::view::{View, ViewController, ViewDelegate};
#[derive(Default)]
struct TestApp;
#[cfg(target_os= "ios")]
impl AppDelegate for TestApp {
fn config_for_scene_session(&self, session: SceneSession, _options: SceneConnectionOptions) -> SceneConfig {
SceneConfig::new("Default Configuration", session.role())
@ -55,10 +57,12 @@ impl ViewDelegate for RootView {
#[derive(Default)]
pub struct WindowScene {
#[cfg(target_os= "ios")]
pub window: RwLock<Option<Window>>,
pub root_view_controller: RwLock<Option<ViewController<RootView>>>
}
#[cfg(target_os= "ios")]
impl WindowSceneDelegate for WindowScene {
fn will_connect(&self, scene: Scene, session: SceneSession, options: SceneConnectionOptions) {
let bounds = scene.get_bounds();
@ -80,5 +84,6 @@ impl WindowSceneDelegate for WindowScene {
}
fn main() {
#[cfg(target_os= "ios")]
App::new(TestApp::default(), || Box::new(WindowScene::default())).run();
}

View file

@ -6,6 +6,7 @@ use cacao::appkit::toolbar::Toolbar;
use cacao::appkit::window::{Window, WindowConfig, WindowDelegate, WindowToolbarStyle};
use cacao::appkit::{App, AppDelegate};
#[cfg(feature = "webview")]
use cacao::webview::{WebView, WebViewConfig, WebViewDelegate};
struct BasicApp {
@ -22,6 +23,7 @@ impl AppDelegate for BasicApp {
#[derive(Default)]
pub struct WebViewInstance;
#[cfg(feature = "webview")]
impl WebViewDelegate for WebViewInstance {
fn on_custom_protocol_request(&self, path: &str) -> Option<Vec<u8>> {
let requested_asset_path = path.replace("cacao://", "");
@ -62,9 +64,11 @@ impl WebViewDelegate for WebViewInstance {
}
struct AppWindow {
#[cfg(feature = "webview")]
content: WebView<WebViewInstance>
}
#[cfg(feature = "webview")]
impl AppWindow {
pub fn new() -> Self {
let mut webview_config = WebViewConfig::default();
@ -82,6 +86,7 @@ impl AppWindow {
}
}
#[cfg(feature = "webview")]
impl WindowDelegate for AppWindow {
const NAME: &'static str = "WindowDelegate";
@ -97,9 +102,12 @@ impl WindowDelegate for AppWindow {
}
}
#[cfg(feature = "webview")]
fn main() {
App::new("com.test.window", BasicApp {
window: Window::with(WindowConfig::default(), AppWindow::new())
})
.run();
}
#[cfg(not(feature = "webview"))]
fn main() {}

View file

@ -7,13 +7,13 @@
//! If you want to show a complex view in an alert-esque fashion, you may consider looking at
//! `Sheet`.
//!
//! ```rust
//! ```rust,no_run
//! use cacao::appkit::{App, AppDelegate, Alert};
//!
//! #[derive(Default)]
//! struct ExampleApp;
//!
//! impl AppDelegate {
//! impl AppDelegate for ExampleApp {
//! fn did_finish_launching(&self) {
//!
//! }

View file

@ -4,8 +4,8 @@
//! heavily by lifecycle events - in this case, your boilerplate would look something like this:
//!
//! ```rust,no_run
//! use cacao::app::{App, AppDelegate};
//! use cacao::window::Window;
//! use cacao::appkit::{App, AppDelegate};
//! use cacao::appkit::window::Window;
//!
//! #[derive(Default)]
//! struct BasicApp;

View file

@ -77,7 +77,14 @@ pub enum CursorType {
/// For a very abbreviated example:
///
/// ```rust,no_run
/// use cacao::appkit::Cursor;
/// use cacao::appkit::CursorType;
/// use cacao::dragdrop::DragInfo;
/// use cacao::dragdrop::DragOperation;
/// use cacao::view::ViewDelegate;
/// struct MyView;
/// impl ViewDelegate for MyView {
/// const NAME: &'static str = "RootView";
/// fn dragging_entered(&self, _info: DragInfo) -> DragOperation {
/// Cursor::push(CursorType::DragCopy);
/// DragOperation::Copy

View file

@ -19,10 +19,10 @@ impl Menu {
///
/// This method effectively does three things:
///
/// - Consumes the MenuItem Vec, and pulls out handlers we need to cache
/// - Configures the menu items appropriately, and wires them up
/// - Drops the values we no longer need, and returns only what's necessary
/// to get the menu functioning.
/// - Consumes the MenuItem Vec, and pulls out handlers we need to cache
/// - Configures the menu items appropriately, and wires them up
/// - Drops the values we no longer need, and returns only what's necessary
/// to get the menu functioning.
///
pub fn new(title: &str, items: Vec<MenuItem>) -> Self {
Menu(unsafe {

View file

@ -66,8 +66,9 @@ pub enum ItemIdentifier {
///
/// For example:
///
/// ``` rust
/// vec![ItemIdentifier::ToggleSidebar, ItemIdentifier::SidebarTracker, ItemIdentifier::Print]
/// ``` rust,no_run
/// use cacao::appkit::toolbar::ItemIdentifier;
/// vec![ItemIdentifier::ToggleSidebar, ItemIdentifier::SidebarTracker, ItemIdentifier::Print];
/// ```
///
/// Would result in the toggle sidebar item showing up in the sidebar on the left, and the

View file

@ -12,13 +12,14 @@
//! # How to use
//!
//! ```rust,no_run
//! use cacao::appkit::app::AppDelegate;
//! use cacao::appkit::AppDelegate;
//! use cacao::appkit::window::{WindowController, WindowDelegate};
//!
//! #[derive(Default)]
//! struct MyWindow;
//!
//! impl WindowDelegate for MyWindow {
//! const NAME: &'static str = "RootView";
//! // Your implementation here...
//! }
//!

View file

@ -6,12 +6,16 @@
//! Some properties are platform-specific; see the documentation for further information.
//!
//! ```rust,no_run
//! use cacao::button::Button;
//! use cacao::view::View;
//! use crate::cacao::layout::Layout;
//! let mut button = Button::new("My button title");
//! button.set_text_equivalent("c");
//! button.set_key_equivalent("c");
//!
//! button.set_action(|| {
//! println!("My button was clicked.");
//! });
//! let my_view : View<()> = todo!();
//!
//! // Make sure you don't let your Button drop for as long as you need it.
//! my_view.add_subview(&button);
@ -56,12 +60,16 @@ pub use enums::*;
/// Some properties are platform-specific; see the documentation for further information.
///
/// ```rust,no_run
/// use cacao::button::Button;
/// use cacao::view::View;
/// use crate::cacao::layout::Layout;
/// let mut button = Button::new("My button title");
/// button.set_text_equivalent("c");
/// button.set_key_equivalent("c");
///
/// button.set_action(|| {
/// println!("My button was clicked.");
/// });
/// let my_view : View<()> = todo!();
///
/// // Make sure you don't let your Button drop for as long as you need it.
/// my_view.add_subview(&button);

View file

@ -246,18 +246,16 @@ impl Color {
let g = green as CGFloat / 255.0;
let b = blue as CGFloat / 255.0;
let a = alpha as CGFloat / 255.0;
#[cfg(feature = "appkit")]
let ptr = unsafe {
Id::from_ptr(msg_send![class!(NSColor), colorWithCalibratedRed:r green:g blue:b alpha:a])
};
#[cfg(all(feature = "uikit", not(feature = "appkit")))]
let ptr = unsafe {
Id::from_ptr(msg_send![class!(UIColor), colorWithRed:r green:g blue:b alpha:a])
};
Color::Custom(Arc::new(RwLock::new(unsafe {
#[cfg(feature = "appkit")]
{
Id::from_ptr(msg_send![class!(NSColor), colorWithCalibratedRed:r green:g blue:b alpha:a])
}
#[cfg(feature = "uikit")]
{
Id::from_ptr(msg_send![class!(UIColor), colorWithRed:r green:g blue:b alpha:a])
}
})))
Color::Custom(Arc::new(RwLock::new(ptr)))
}
/// Creates and returns a color in the RGB space, with the alpha level
@ -280,7 +278,7 @@ impl Color {
Id::from_ptr(msg_send![class!(NSColor), colorWithCalibratedHue:h saturation:s brightness:b alpha:a])
}
#[cfg(feature = "uikit")]
#[cfg(all(feature = "uikit", not(feature = "appkit")))]
{
Id::from_ptr(msg_send![class!(UIColor), colorWithHue:h saturation:s brightness:b alpha:a])
}
@ -302,7 +300,7 @@ impl Color {
Id::from_ptr(msg_send![class!(NSColor), colorWithCalibratedWhite:level alpha:alpha])
}
#[cfg(feature = "uikit")]
#[cfg(all(feature = "uikit", not(feature = "appkit")))]
{
Id::from_ptr(msg_send![class!(UIColor), colorWithWhite:level alpha:alpha])
}

View file

@ -22,12 +22,13 @@
//! let mut defaults = UserDefaults::standard();
//!
//! defaults.register({
//! let map = HashMap::new();
//! let mut map = HashMap::new();
//! map.insert("test", Value::string("value"));
//! map
//! });
//!
//! let value = defaults.get("test").unwrap().as_str().unwrap();
//! let value = defaults.get("test").unwrap();
//! let value = value.as_str().unwrap();
//! assert_eq!(value, "value");
//! ```
@ -160,13 +161,14 @@ impl UserDefaults {
/// Note that this also returns owned values, not references. `NSUserDefaults` explicitly
/// returns new immutable copies each time, so we're free to vend them as such.
///
/// ```rust
/// ```rust,no_run
/// use cacao::defaults::{UserDefaults, Value};
///
/// let mut defaults = UserDefaults::standard();
/// defaults.insert("test", Value::string("value"));
///
/// let value = defaults.get("test").unwrap().as_str().unwrap();
/// let value = defaults.get("test").unwrap();
/// let value = value.as_str().unwrap();
/// assert_eq!(value, "value");
/// ```
pub fn get<K: AsRef<str>>(&self, key: K) -> Option<Value> {

View file

@ -15,7 +15,7 @@ lazy_static! {
/// constantly calling into the runtime, we store pointers to Class types here after first lookup
/// and/or creation. The general store format is (roughly speaking) as follows:
///
/// ```no_run
/// ```ignore
/// {
/// "subclass_type": {
/// "superclass_type": *const Class as usize

View file

@ -5,24 +5,27 @@
//! TextFields implement Autolayout, which enable you to specify how things should appear on the screen.
//!
//! ```rust,no_run
//! use cacao::color::rgb;
//! use cacao::color::Color;
//! use cacao::layout::{Layout, LayoutConstraint};
//! use cacao::view::TextField;
//! use cacao::window::{Window, WindowDelegate};
//! use cacao::input::TextField;
//! use cacao::view::View;
//! use cacao::appkit::window::{Window, WindowDelegate};
//!
//! #[derive(Default)]
//! struct AppWindow {
//! content: TextField,
//! label: TextField,
//! red: View,
//! window: Window
//! }
//!
//! impl WindowDelegate for AppWindow {
//! const NAME: &'static str = "RootView";
//! fn did_load(&mut self, window: Window) {
//! window.set_minimum_content_size(300., 300.);
//! self.window = window;
//!
//! self.label.set_background_color(rgb(224, 82, 99));
//! self.label.set_background_color(Color::rgb(224, 82, 99));
//! self.label.set_text("LOL");
//! self.content.add_subview(&self.red);
//!

View file

@ -5,6 +5,8 @@
//!
//! ```rust,no_run
//! // Create a rounded red box
//! use cacao::view::View;
//! use cacao::color::Color;
//! let view = View::default();
//! view.set_background_color(Color::SystemRed);
//! view.layer.set_corner_radius(4.0);
@ -24,6 +26,8 @@ use crate::utils::properties::ObjcProperty;
///
/// ```rust,no_run
/// // Create a rounded red box
/// use cacao::view::View;
/// use cacao::color::Color;
/// let view = View::default();
/// view.set_background_color(Color::SystemRed);
/// view.layer.set_corner_radius(4.0);

View file

@ -27,7 +27,7 @@
//! # Hello World
//!
//! ```rust,no_run
//! use cacao::appkit::app::{App, AppDelegate};
//! use cacao::appkit::{App, AppDelegate};
//! use cacao::appkit::window::Window;
//!
//! #[derive(Default)]

View file

@ -7,10 +7,10 @@
//! Views implement Autolayout, which enable you to specify how things should appear on the screen.
//!
//! ```rust,no_run
//! use cacao::color::rgb;
//! use cacao::color::Color;
//! use cacao::layout::{Layout, LayoutConstraint};
//! use cacao::view::View;
//! use cacao::window::{Window, WindowDelegate};
//! use cacao::appkit::window::{Window, WindowDelegate};
//!
//! #[derive(Default)]
//! struct AppWindow {
@ -20,11 +20,12 @@
//! }
//!
//! impl WindowDelegate for AppWindow {
//! const NAME: &'static str = "RootView";
//! fn did_load(&mut self, window: Window) {
//! window.set_minimum_content_size(300., 300.);
//! self.window = window;
//!
//! self.red.set_background_color(rgb(224, 82, 99));
//! self.red.set_background_color(Color::rgb(224, 82, 99));
//! self.content.add_subview(&self.red);
//!
//! self.window.set_content_view(&self.content);
@ -532,6 +533,9 @@ impl<T> ListView<T> {
/// `reload_rows`, or `remove_rows` from there.
///
/// ```rust,no_run
/// use cacao::listview::ListView;
/// use cacao::listview::RowAnimation;
/// let list_view: ListView<()> = todo!();
/// list_view.perform_batch_updates(|listview| {
/// listview.insert_rows(&[0, 2], RowAnimation::SlideDown);
/// });
@ -712,7 +716,13 @@ impl<T> ListView<T> {
/// For example (minus the other necessary ListViewDelegate pieces):
///
/// ```rust,no_run
/// use cacao::appkit::menu::MenuItem;
/// use cacao::listview::{ListViewDelegate, ListView, ListViewRow};
/// struct MyListView {
/// list_view: ListView<()>,
/// };
/// impl ListViewDelegate for MyListView {
/// const NAME: &'static str = "RootListView";
/// fn context_menu(&self) -> Vec<MenuItem> {
/// let clicked_row = self.list_view.get_clicked_row_index();
///
@ -724,6 +734,9 @@ impl<T> ListView<T> {
/// // User right-clicked on a row, so let's show an edit menu.
/// vec![MenuItem::new("Edit")]
/// }
/// fn did_load(&mut self, _: ListView) { todo!() }
/// fn number_of_items(&self) -> usize { todo!() }
/// fn item_for(&self, _: usize) -> ListViewRow { todo!() }
/// }
/// ```
pub fn get_clicked_row_index(&self) -> NSInteger {

View file

@ -6,7 +6,7 @@
//!
//! Views implement Autolayout, which enable you to specify how things should appear on the screen.
//!
//! ```rust,no_run
//! ```rust,compile_fail
//! use cacao::color::rgb;
//! use cacao::layout::{Layout, LayoutConstraint};
//! use cacao::view::View;
@ -20,6 +20,7 @@
//! }
//!
//! impl WindowDelegate for AppWindow {
//! const NAME: &'static str = "RootView";
//! fn did_load(&mut self, window: Window) {
//! window.set_minimum_content_size(300., 300.);
//! self.window = window;

View file

@ -4,7 +4,7 @@
/// performance, but is good enough for many applications. Implement this trait on your struct
/// that implements `AppDelegate`, and then dispatch messages like the following:
///
/// ```rust,no_run
/// ```rust,compile_fail
/// App::<YourAppDelegate, YourMessageType>::dispatch_main(your_message);
/// ```
///

View file

@ -5,7 +5,7 @@
//! (where you have a fixed start and end) and indeterminate (infinite; it will go and go until you
//! tell it to stop).
//!
//! ```rust,no_run
//! ```rust,compile_fail
//! let indicator = ProgressIndicator::new();
//! indicator.set_indeterminate(true);
//! my_view.add_subview(&indicator);

View file

@ -7,10 +7,10 @@
//! Views implement Autolayout, which enable you to specify how things should appear on the screen.
//!
//! ```rust,no_run
//! use cacao::color::rgb;
//! use cacao::color::Color;;
//! use cacao::layout::{Layout, LayoutConstraint};
//! use cacao::view::View;
//! use cacao::window::{Window, WindowDelegate};
//! use cacao::appkit::window::{Window, WindowDelegate};
//!
//! #[derive(Default)]
//! struct AppWindow {
@ -20,11 +20,12 @@
//! }
//!
//! impl WindowDelegate for AppWindow {
//! const NAME: &'static str = "WindowDelegate";
//! fn did_load(&mut self, window: Window) {
//! window.set_minimum_content_size(300., 300.);
//! self.window = window;
//!
//! self.red.set_background_color(rgb(224, 82, 99));
//! self.red.set_background_color(Color::rgb(224, 82, 99));
//! self.content.add_subview(&self.red);
//!
//! self.window.set_content_view(&self.content);

View file

@ -28,8 +28,13 @@ use crate::layout::{LayoutAnchorDimension, LayoutAnchorX, LayoutAnchorY};
/// Some properties are platform-specific; see the documentation for further information.
///
/// ```rust,no_run
/// use cacao::select::Select;
/// use cacao::view::View;
/// use crate::cacao::layout::Layout;
///
/// let mut dropdown = Select::new();
///
/// let my_view : View<()> = todo!();
/// // Make sure you don't let your Select drop for as long as you need it.
/// my_view.add_subview(&dropdown);
/// ```

View file

@ -4,25 +4,28 @@
//!
//! Labels implement Autolayout, which enable you to specify how things should appear on the screen.
//!
//! ```rust,no_run
//! use cacao::color::rgb;
//! ```rust
//! use cacao::color::Color;
//! use cacao::layout::{Layout, LayoutConstraint};
//! use cacao::view::Label;
//! use cacao::window::{Window, WindowDelegate};
//! use cacao::text::Label;
//! use cacao::view::View;
//! use cacao::appkit::window::{Window, WindowDelegate};
//!
//! #[derive(Default)]
//! struct AppWindow {
//! content: Label,
//! label: Label,
//! red: View,
//! window: Window
//! }
//!
//! impl WindowDelegate for AppWindow {
//! const NAME: &'static str = "RootView";
//! fn did_load(&mut self, window: Window) {
//! window.set_minimum_content_size(300., 300.);
//! self.window = window;
//!
//! self.label.set_background_color(rgb(224, 82, 99));
//! self.label.set_background_color(Color::rgb(224, 82, 99));
//! self.label.set_text("LOL");
//! self.content.add_subview(&self.red);
//!
@ -107,25 +110,28 @@ fn allocate_view(registration_fn: fn() -> *const Class) -> id {
///
/// Labels implement Autolayout, which enable you to specify how things should appear on the screen.
///
/// ```rust,no_run
/// use cacao::color::rgb;
/// ```rust
/// use cacao::color::Color;
/// use cacao::layout::{Layout, LayoutConstraint};
/// use cacao::view::Label;
/// use cacao::window::{Window, WindowDelegate};
/// use cacao::text::Label;
/// use cacao::appkit::window::{Window, WindowDelegate};
/// use cacao::view::View;
///
/// #[derive(Default)]
/// struct AppWindow {
/// content: Label,
/// label: Label,
/// red: View,
/// window: Window
/// }
///
/// impl WindowDelegate for AppWindow {
/// const NAME: &'static str = "RootView";
/// fn did_load(&mut self, window: Window) {
/// window.set_minimum_content_size(300., 300.);
/// self.window = window;
///
/// self.label.set_background_color(rgb(224, 82, 99));
/// self.label.set_background_color(Color::rgb(224, 82, 99));
/// self.label.set_text("LOL");
/// self.content.add_subview(&self.red);
///

View file

@ -22,9 +22,13 @@ mod native_interface;
///
/// ## Example
/// ```rust,no_run
/// use cacao::view::ViewDelegate;
///
/// struct ContentViewDelegate;
///
/// impl ViewDelegate for ContentViewDelegate {
/// const NAME: &'static str = "ContentViewDelegate";
///
/// fn will_appear(&self, animated: bool) {
/// println!("This controller is about to appear!");
/// }

View file

@ -6,11 +6,11 @@
//!
//! Views implement Autolayout, which enable you to specify how things should appear on the screen.
//!
//! ```rust,no_run
//! ```rust
//! use cacao::color::Color;
//! use cacao::layout::{Layout, LayoutConstraint};
//! use cacao::view::View;
//! use cacao::window::{Window, WindowDelegate};
//! use cacao::appkit::window::{Window, WindowDelegate};
//!
//! #[derive(Default)]
//! struct AppWindow {
@ -20,6 +20,7 @@
//! }
//!
//! impl WindowDelegate for AppWindow {
//! const NAME: &'static str = "RootView";
//! fn did_load(&mut self, window: Window) {
//! window.set_minimum_content_size(300., 300.);
//! self.window = window;