reflexion 0.1.41 → 0.1.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b412c2e913baaeacdd4afff628c339c01a6ce7359572901d6193fc97d772a426
-  data.tar.gz: f8cba434ac873919a9bd75ea5c5e08d0436eb672313e60541d5634b210b81b76
+  metadata.gz: fa7ec97efd9d68e5053ddc3bf852f718a66ff883a5bb8693f605dcf45e962732
+  data.tar.gz: f2fd1319de6f1032802ce96c6657e9ac7dc0327a10c9ef9b1ba2f910c117c57a
 SHA512:
-  metadata.gz: 7b6f7fd46e08e459010a98facf5c8e800c326f93d0482b0649c4f20a6bc54537947e5e3316285db7e759870c7739c68ab5284fba8f4640fb88e5dc02c106b598
-  data.tar.gz: a30e5f7bde2f8f9b09ff0e76847d2bbbfefe9187e3888224409ebfe04a72c05e36387ab4a976f0dd385f1ead5aa749d1ba8478182030e73058879792b0ca051e
+  metadata.gz: 61d0f5a9fc7ec41480642825f071d103d211035a38bcfda25eb90789fb642cf2663dce3f18771cc3702482e0a78d0385c4601ab23b4654f677f946af6000b425
+  data.tar.gz: abd4d92237cd9d49795ce5010b38565d7f3a4abd0b73ae4b18ca1989e748e911144ac3b11bdc6869400599c8eac6f120f751f75484c821a483b7475aefcec78a

data/ChangeLog.md

@@ -1,6 +1,14 @@
 # reflex ChangeLog
 
 
+## [v0.1.42] - 2023-06-02
+
+- Implement the Screen class for iOS
+- Implement Window_get_screen() for iOS
+- Implement window flags for iOS
+- Update reflexView's size on viewDidLayoutSubviews
+
+
 ## [v0.1.41] - 2023-05-29
 
 - Add Reflex::Screen class

data/VERSION

@@ -1 +1 @@
-0.1.41
+0.1.42

data/src/ios/screen.h

@@ -0,0 +1,20 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_SRC_IOS_SCREEN_H__
+#define __REFLEX_SRC_IOS_SCREEN_H__
+
+
+#include "reflex/screen.h"
+
+
+namespace Reflex
+{
+
+
+	void Screen_initialize (Screen* pthis, UIScreen* screen);
+
+
+}// Reflex
+
+
+#endif//EOH

data/src/ios/screen.mm

@@ -0,0 +1,62 @@
+// -*- mode: objc -*-
+#include "screen.h"
+
+
+#include "reflex/exception.h"
+
+
+namespace Reflex
+{
+
+
+	struct Screen::Data
+	{
+
+		UIScreen* screen = nil;
+
+		~Data ()
+		{
+			if (screen) [screen release];
+		}
+
+	};// Screen::Data
+
+
+	void
+	Screen_initialize (Screen* pthis, UIScreen* screen)
+	{
+		pthis->self->screen = [screen retain];
+	}
+
+
+	Screen::Screen ()
+	{
+	}
+
+	Screen::~Screen ()
+	{
+	}
+
+	Bounds
+	Screen::frame () const
+	{
+		if (!*this)
+			invalid_state_error(__FILE__, __LINE__);
+
+		CGRect b = self->screen.bounds;
+		return Bounds(b.origin.x, b.origin.y, b.size.width, b.size.height);
+	}
+
+	Screen::operator bool () const
+	{
+		return self->screen;
+	}
+
+	bool
+	Screen::operator ! () const
+	{
+		return !operator bool();
+	}
+
+
+}// Reflex

data/src/ios/view_controller.h

@@ -17,6 +17,8 @@
 
 	- (void) stopTimer;
 
+	- (void) update;
+
 	- (void) viewDidResize;
 
 	- (void) titleDidChange;

data/src/ios/view_controller.mm

@@ -293,6 +293,12 @@ ReflexViewController_get_show_fun ()
 		[super viewDidDisappear: animated];
 	}
 
+	- (void)viewDidLayoutSubviews
+	{
+		[super viewDidLayoutSubviews];
+		self.reflexView.frame = self.view.bounds;
+	}
+
 	- (void) startTimer
 	{
 		[self startTimer: 60];

data/src/ios/window.h

@@ -17,9 +17,7 @@ namespace Reflex
 	struct WindowData : public Window::Data
 	{
 
-		ReflexViewController* view_controller;
-
-		WindowData ();
+		ReflexViewController* view_controller = nil;
 
 		bool is_valid () const
 		{

data/src/ios/window.mm

@@ -3,6 +3,7 @@
 
 
 #include "reflex/exception.h"
+#include "screen.h"
 #import "view_controller.h"
 
 
@@ -48,6 +49,12 @@ namespace Reflex
 		return new WindowData();
 	}
 
+	uint
+	Window_default_flags ()
+	{
+		return 0;
+	}
+
 	void
 	Window_initialize (Window* window)
 	{
@@ -127,24 +134,44 @@ namespace Reflex
 	Bounds
 	Window_get_frame (const Window& window)
 	{
-		CGRect rect = get_vc(&window).reflexView.bounds;
-		return Bounds(
-			rect.origin.x,
-			rect.origin.y,
-			rect.size.width,
-			rect.size.height);
+		CGRect b = get_vc(&window).reflexView.bounds;
+		return Bounds(b.origin.x, b.origin.y, b.size.width, b.size.height);
 	}
 
 	void
-	Window_set_resizable (Window* window, bool state)
+	Window_set_flags (Window* window, uint flags)
 	{
-		//not_implemented_error(__FILE__, __LINE__);
+		if (Xot::has_flag(flags, Window::FLAG_CLOSABLE))
+			argument_error(__FILE__, __LINE__, "FLAG_CLOSABLE is not supported");
+
+		if (Xot::has_flag(flags, Window::FLAG_MINIMIZABLE))
+			argument_error(__FILE__, __LINE__, "FLAG_MINIMIZABLE is not supported");
+
+		if (Xot::has_flag(flags, Window::FLAG_RESIZABLE))
+			argument_error(__FILE__, __LINE__, "FLAG_RESIZABLE is not supported");
+	}
+
+	static UIScreen*
+	get_screen (const Window& window)
+	{
+		UIWindow* w = get_vc(&window).view.window;
+		if (@available(iOS 13.0, *))
+		{
+			return w.windowScene.screen;
+		}
+		else
+		{
+			return w.screen;
+		}
 	}
 
-	bool
-	Window_is_resizable (const Window& window)
+	Screen
+	Window_get_screen (const Window& window)
 	{
-		return false;
+		Screen s;
+		UIScreen* screen = get_screen(window);
+		Screen_initialize(&s, screen ? screen : UIScreen.mainScreen);
+		return s;
 	}
 
 	float
@@ -154,10 +181,4 @@ namespace Reflex
 	}
 
 
-	WindowData::WindowData ()
-	{
-		view_controller = nil;
-	}
-
-
 }// Reflex

data/src/osx/native_window.mm

@@ -15,8 +15,8 @@
 static NSWindowStyleMask
 default_style_mask ()
 {
-	return Window_make_style_mask(
-		Reflex::Window::Data::FLAG_DEFAULT,
+	return Reflex::Window_make_style_mask(
+		Reflex::Window_default_flags(),
 		NSTitledWindowMask | NSTexturedBackgroundWindowMask);
 }
 

data/src/osx/screen.mm

@@ -2,6 +2,9 @@
 #include "screen.h"
 
 
+#include "reflex/exception.h"
+
+
 namespace Reflex
 {
 
@@ -37,10 +40,11 @@ namespace Reflex
 	Bounds
 	Screen::frame () const
 	{
-		NSRect frame = self->screen.frame;
-		return Bounds(
-			frame.origin.x,   frame.origin.y,
-			frame.size.width, frame.size.height);
+		if (!*this)
+			invalid_state_error(__FILE__, __LINE__);
+
+		NSRect f = self->screen.frame;
+		return Bounds(f.origin.x, f.origin.y, f.size.width, f.size.height);
 	}
 
 	Screen::operator bool () const

data/src/osx/window.h

@@ -18,12 +18,10 @@ namespace Reflex
 	struct WindowData : public Window::Data
 	{
 
-		NativeWindow* native;
+		NativeWindow* native = nil;
 
 		mutable String title_tmp;
 
-		WindowData ();
-
 		bool is_valid () const
 		{
 			return native;

data/src/osx/window.mm

@@ -70,6 +70,15 @@ namespace Reflex
 		return new WindowData();
 	}
 
+	uint
+	Window_default_flags ()
+	{
+		return
+			Window::FLAG_CLOSABLE    |
+			Window::FLAG_MINIMIZABLE |
+			Window::FLAG_RESIZABLE;
+	}
+
 	void
 	Window_initialize (Window* window)
 	{
@@ -126,12 +135,8 @@ namespace Reflex
 	Window_get_frame (const Window& window)
 	{
 		NativeWindow* native = get_native(&window);
-		NSRect rect = [native contentRectForFrameRect: [native frame]];
-		return Bounds(
-			rect.origin.x,
-			rect.origin.y,
-			rect.size.width,
-			rect.size.height);
+		NSRect r = [native contentRectForFrameRect: [native frame]];
+		return Bounds(r.origin.x, r.origin.y, r.size.width, r.size.height);
 	}
 
 	void
@@ -149,8 +154,8 @@ namespace Reflex
 	Window_get_screen (const Window& window)
 	{
 		Screen s;
-		NativeWindow* native = get_native(&window);
-		if (native && native.screen) Screen_initialize(&s, native.screen);
+		NSScreen* screen = get_native(&window).screen;
+		if (screen) Screen_initialize(&s, screen);
 		return s;
 	}
 
@@ -161,10 +166,4 @@ namespace Reflex
 	}
 
 
-	WindowData::WindowData ()
-	{
-		native = nil;
-	}
-
-
 }// Reflex

data/src/window.cpp

@@ -22,6 +22,17 @@ namespace Reflex
 	using TargetPointerMap      = Window::Data::TargetPointerMap;
 
 
+	Window::Data::Data ()
+	:	flags(Window_default_flags())
+	{
+		prev_time_update = prev_time_draw = Xot::time();
+	}
+
+	Window::Data::~Data ()
+	{
+	}
+
+
 	Window::Data::PointerData::PointerData (uint view_index)
 	:	view_index(view_index)
 	{
@@ -520,17 +531,23 @@ namespace Reflex
 	void
 	Window::add_flag (uint flags)
 	{
-		Xot::add_flag(&self->flags, flags);
+		uint value = self->flags;
+		Xot::add_flag(&value, flags);
 
-		Window_set_flags(this, self->flags);
+		Window_set_flags(this, value);
+
+		self->flags = value;
 	}
 
 	void
 	Window::remove_flag (uint flags)
 	{
-		Xot::remove_flag(&self->flags, flags);
+		uint value = self->flags;
+		Xot::remove_flag(&value, flags);
+
+		Window_set_flags(this, value);
 
-		Window_set_flags(this, self->flags);
+		self->flags = value;
 	}
 
 	bool

data/src/window.h

@@ -37,8 +37,6 @@ namespace Reflex
 
 		typedef std::map<View::Ref, TargetPointerMap> CaptureMap;
 
-		enum {FLAG_DEFAULT = FLAG_CLOSABLE | FLAG_MINIMIZABLE | FLAG_RESIZABLE};
-
 		int hide_count = 1;
 
 		bool redraw = true;
@@ -53,16 +51,11 @@ namespace Reflex
 
 		CaptureMap captures;
 
-		uint flags = FLAG_DEFAULT;
+		uint flags;
 
-		Data ()
-		{
-			prev_time_update = prev_time_draw = Xot::time();
-		}
+		Data ();
 
-		virtual ~Data ()
-		{
-		}
+		virtual ~Data ();
 
 		virtual bool is_valid () const = 0;
 
@@ -81,6 +74,8 @@ namespace Reflex
 
 	Window::Data* Window_create_data ();
 
+	uint Window_default_flags ();
+
 	void Window_initialize (Window* window);
 
 	void Window_show (Window* window);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reflexion
 version: !ruby/object:Gem::Version
-  version: 0.1.41
+  version: 0.1.42
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-29 00:00:00.000000000 Z
+date: 2023-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -355,6 +355,8 @@ files:
 - src/ios/event.h
 - src/ios/event.mm
 - src/ios/reflex.mm
+- src/ios/screen.h
+- src/ios/screen.mm
 - src/ios/view_controller.h
 - src/ios/view_controller.mm
 - src/ios/window.h