reflexion 0.1.56 → 0.1.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b75a2425ed2b69cbe088066cc1b98fff892a899c015907245b697284d62f7455
-  data.tar.gz: 5b10afa2ad4999bd0f98066790e8641712fece4e0029893cd6734bc8c4df2776
+  metadata.gz: 02fdc15de8ef558e7278dfdff35b09408002fc3f20f3ab0913ac887a72c74ea6
+  data.tar.gz: e67ba5410334498eeea9ca321ab29d39a60d837d97fa69945adc041560087829
 SHA512:
-  metadata.gz: e76d094345bcf5c78ab57970a99900cefe3dfaf7ff0470ae9af5859767d417897ae422c229197ef5d3a352263335aaa278d9835e8f3e583c33f27ff0343b757a
-  data.tar.gz: a97686a643c8c2b35115b686aef9cfa509b6c257f42266e703b3d53afed4082ef131dcbdcac73727270936595b2eeee18b988cdf37455060d53be31fa4b052ce
+  metadata.gz: 62e8dc0bfb08ad9bcd2403821d351aed82b7bc244abb5dd1267dc7190fb4c2c7aac7f63c7c82b64fad2a372c276332d877e22985e9632baa9ace583c6084e646
+  data.tar.gz: ee0dbbdab07c9e1b61ea4b7ee0a9f0ff2de25a8c3e3a8186bd9c7c822c5dc98a6b33d469b9883a688d6a0952eab88e23a0a663d8623476fe412e42169956c0cc

data/.doc/ext/reflex/window.cpp

@@ -166,6 +166,26 @@ VALUE is_resizable(VALUE self)
 	return value(THIS->has_flag(Reflex::Window::FLAG_RESIZABLE));
 }
 
+static
+VALUE set_fullscreen(VALUE self, VALUE state)
+{
+	CHECK;
+
+	if (state)
+		THIS->   add_flag(Reflex::Window::FLAG_FULLSCREEN);
+	else
+		THIS->remove_flag(Reflex::Window::FLAG_FULLSCREEN);
+
+	return state;
+}
+
+static
+VALUE is_fullscreen(VALUE self)
+{
+	CHECK;
+	return value(THIS->has_flag(Reflex::Window::FLAG_FULLSCREEN));
+}
+
 static const uint ORIENTATION_MASK =
 	Reflex::Window::FLAG_PORTRAIT | Reflex::Window::FLAG_LANDSCAPE;
 
@@ -370,11 +390,13 @@ Init_reflex_window ()
 	rb_define_method(cWindow, "frame=", RUBY_METHOD_FUNC(set_frame), -1);
 	rb_define_method(cWindow, "frame", RUBY_METHOD_FUNC(get_frame), 0);
 	rb_define_method(cWindow, "closable=", RUBY_METHOD_FUNC(set_closable), 1);
-	cWindow.define_method("closable?",      is_closable);
+	cWindow.define_method("closable?",     is_closable);
 	rb_define_method(cWindow, "minimizable=", RUBY_METHOD_FUNC(set_minimizable), 1);
-	cWindow.define_method("minimizable?",   is_minimizable);
+	cWindow.define_method("minimizable?",  is_minimizable);
 	rb_define_method(cWindow, "resizable=", RUBY_METHOD_FUNC(set_resizable), 1);
-	cWindow.define_method("resizable?",     is_resizable);
+	cWindow.define_method("resizable?",    is_resizable);
+	rb_define_method(cWindow, "fullscreen=", RUBY_METHOD_FUNC(set_fullscreen), 1);
+	cWindow.define_method("fullscreen?",   is_fullscreen);
 	rb_define_method(cWindow, "orientations=", RUBY_METHOD_FUNC(set_orientations), 1);
 	rb_define_method(cWindow, "orientations", RUBY_METHOD_FUNC(get_orientations), 0);
 	rb_define_method(cWindow, "hidden", RUBY_METHOD_FUNC(hidden), 0);

data/ChangeLog.md

@@ -1,6 +1,14 @@
 # reflex ChangeLog
 
 
+## [v0.1.57] - 2024-02-07
+
+- Add Window#fullscreen accessor
+- Window now appears on active screen when displayed
+
+- Fix Window#set_frame updating to a position that was lower than the correct position by the height of the window title bar
+- Fix a bug that the window position origin (0, 0) was at the bottom-left corner of the screen; now it is at the top-left corner of the screen
+
 ## [v0.1.56] - 2024-01-08
 
 - Delete Polygon::Line because it was merged into Polyline

data/VERSION

@@ -1 +1 @@
-0.1.56
+0.1.57

data/ext/reflex/window.cpp

@@ -184,6 +184,28 @@ RUCY_DEF0(is_resizable)
 }
 RUCY_END
 
+static
+RUCY_DEF1(set_fullscreen, state)
+{
+	CHECK;
+
+	if (state)
+		THIS->   add_flag(Reflex::Window::FLAG_FULLSCREEN);
+	else
+		THIS->remove_flag(Reflex::Window::FLAG_FULLSCREEN);
+
+	return state;
+}
+RUCY_END
+
+static
+RUCY_DEF0(is_fullscreen)
+{
+	CHECK;
+	return value(THIS->has_flag(Reflex::Window::FLAG_FULLSCREEN));
+}
+RUCY_END
+
 static const uint ORIENTATION_MASK =
 	Reflex::Window::FLAG_PORTRAIT | Reflex::Window::FLAG_LANDSCAPE;
 
@@ -411,12 +433,14 @@ Init_reflex_window ()
 	cWindow.define_method("title", get_title);
 	cWindow.define_method("frame=", set_frame);
 	cWindow.define_method("frame",  get_frame);
-	cWindow.define_method("closable=",     set_closable);
-	cWindow.define_method("closable?",      is_closable);
-	cWindow.define_method("minimizable=",  set_minimizable);
-	cWindow.define_method("minimizable?",   is_minimizable);
-	cWindow.define_method("resizable=",    set_resizable);
-	cWindow.define_method("resizable?",     is_resizable);
+	cWindow.define_method("closable=",    set_closable);
+	cWindow.define_method("closable?",     is_closable);
+	cWindow.define_method("minimizable=", set_minimizable);
+	cWindow.define_method("minimizable?",  is_minimizable);
+	cWindow.define_method("resizable=",   set_resizable);
+	cWindow.define_method("resizable?",    is_resizable);
+	cWindow.define_method("fullscreen=",  set_fullscreen);
+	cWindow.define_method("fullscreen?",   is_fullscreen);
 	cWindow.define_method("orientations=", set_orientations);
 	cWindow.define_method("orientations",  get_orientations);
 	cWindow.define_method("hidden", hidden);

data/include/reflex/window.h

@@ -39,9 +39,11 @@ namespace Reflex
 
 				FLAG_RESIZABLE   = Xot::bit(2),
 
-				FLAG_PORTRAIT    = Xot::bit(3),
+				FLAG_FULLSCREEN  = Xot::bit(3),
 
-				FLAG_LANDSCAPE   = Xot::bit(4),
+				FLAG_PORTRAIT    = Xot::bit(4),
+
+				FLAG_LANDSCAPE   = Xot::bit(5),
 
 				FLAG_LAST        = FLAG_LANDSCAPE
 

data/lib/reflex/window.rb

@@ -70,7 +70,8 @@ module Reflex
     universal_accessor :title, :frame,
       closable:    {reader: :closable?},
       minimizable: {reader: :minimizable?},
-      resizable:   {reader: :resizable?}
+      resizable:   {reader: :resizable?},
+      fullscreen:  {reader: :fullscreen?}
 
     def initialize(options = nil, &block)
       super()

data/reflex.gemspec

@@ -25,10 +25,10 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 3.0.0'
 
-  s.add_runtime_dependency 'xot',   '~> 0.1.41'
-  s.add_runtime_dependency 'rucy',  '~> 0.1.43'
-  s.add_runtime_dependency 'beeps', '~> 0.1.45'
-  s.add_runtime_dependency 'rays',  '~> 0.1.48'
+  s.add_runtime_dependency 'xot',   '~> 0.1.42'
+  s.add_runtime_dependency 'rucy',  '~> 0.1.44'
+  s.add_runtime_dependency 'beeps', '~> 0.1.46'
+  s.add_runtime_dependency 'rays',  '~> 0.1.49'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/src/osx/native_window.h

@@ -6,6 +6,8 @@
 
 	- (void) draw;
 
+	- (BOOL) hasFullScreenFlag;
+
 	+ (NSRect) frameRectForContentRect: (NSRect) contentRect;
 
 @end// NativeWindow

data/src/osx/native_window.mm

@@ -42,6 +42,17 @@ update_pixel_density (Reflex::Window* window)
 	}
 }
 
+static void
+move_to_main_screen_origin (NativeWindow* window)
+{
+	NSRect frame   = window.frame;
+	NSRect screen  = NSScreen.mainScreen.visibleFrame;
+	frame.origin.x = screen.origin.x;
+	frame.origin.y = screen.origin.y + screen.size.height;
+
+	[window setFrame: frame display: NO animate: NO];
+}
+
 
 @implementation NativeWindow
 
@@ -88,6 +99,8 @@ update_pixel_density (Reflex::Window* window)
 
 	- (void) bind: (Reflex::Window*) window
 	{
+		move_to_main_screen_origin(self);
+
 		if (!window)
 			Reflex::argument_error(__FILE__, __LINE__);
 
@@ -221,6 +234,11 @@ update_pixel_density (Reflex::Window* window)
 		Window_call_draw_event(win, &e);
 	}
 
+	- (BOOL) hasFullScreenFlag
+	{
+		return self.styleMask & NSWindowStyleMaskFullScreen;
+	}
+
 	- (BOOL) windowShouldClose: (id) sender
 	{
 		Reflex::Window* win = self.window;
@@ -299,6 +317,41 @@ update_pixel_density (Reflex::Window* window)
 		}
 	}
 
+	- (void) windowWillEnterFullScreen: (NSNotification*) notification
+	{
+		[self updateFullScreenFlag];
+	}
+
+	- (void) windowDidEnterFullScreen: (NSNotification*) notification
+	{
+		[self updateFullScreenFlag];
+	}
+
+	- (void) windowWillExitFullScreen: (NSNotification*) notification
+	{
+		[self updateFullScreenFlag];
+	}
+
+	- (void) windowDidExitFullScreen: (NSNotification*) notification
+	{
+		[self updateFullScreenFlag];
+	}
+
+	- (void) updateFullScreenFlag
+	{
+		Reflex::Window* win = self.window;
+		if (!win) return;
+
+		bool fullscreen = self.hasFullScreenFlag;
+		if (fullscreen == win->has_flag(Reflex::Window::FLAG_FULLSCREEN))
+			return;
+
+		if (fullscreen)
+			win->add_flag(Reflex::Window::FLAG_FULLSCREEN);
+		else
+			win->remove_flag(Reflex::Window::FLAG_FULLSCREEN);
+	}
+
 	- (void) windowDidBecomeKey: (NSNotification*) notification
 	{
 		Window_call_activate_event(self.window);

data/src/osx/screen.h

@@ -12,6 +12,9 @@ namespace Reflex
 {
 
 
+	CGFloat primary_screen_height ();
+
+
 	void Screen_initialize (Screen* pthis, NSScreen* screen);
 
 

data/src/osx/screen.mm

@@ -22,6 +22,12 @@ namespace Reflex
 	};// Screen::Data
 
 
+	CGFloat
+	primary_screen_height ()
+	{
+		return NSScreen.screens.firstObject.frame.size.height;
+	}
+
 	void
 	Screen_initialize (Screen* pthis, NSScreen* screen)
 	{
@@ -44,7 +50,11 @@ namespace Reflex
 			invalid_state_error(__FILE__, __LINE__);
 
 		NSRect f = self->screen.frame;
-		return Bounds(f.origin.x, f.origin.y, f.size.width, f.size.height);
+		return Bounds(
+			f.origin.x,
+			primary_screen_height() - (f.origin.y + f.size.height),
+			f.size.width,
+			f.size.height);
 	}
 
 	Screen::operator bool () const

data/src/osx/window.mm

@@ -124,19 +124,23 @@ namespace Reflex
 	}
 
 	void
-	Window_set_frame (Window* window, coord x, coord y, coord width, coord height)
+	Window_set_frame (Window* window, coord x, coord y, coord w, coord h)
 	{
-		NSRect frame =
-			[NativeWindow frameRectForContentRect: NSMakeRect(x, y, width, height)];
-		[get_native(window) setFrame: frame display: NO animate: NO];
+		NSRect f   = [NativeWindow frameRectForContentRect: NSMakeRect(x, y, w, h)];
+		f.origin.y = primary_screen_height() - (f.origin.y + h);
+
+		[get_native(window) setFrame: f display: NO animate: NO];
 	}
 
 	Bounds
 	Window_get_frame (const Window& window)
 	{
 		NativeWindow* native = get_native(&window);
-		NSRect r = [native contentRectForFrameRect: [native frame]];
-		return Bounds(r.origin.x, r.origin.y, r.size.width, r.size.height);
+
+		NSRect f   = [native contentRectForFrameRect: native.frame];
+		f.origin.y = primary_screen_height() - (f.origin.y + f.size.height);
+
+		return Bounds(f.origin.x, f.origin.y, f.size.width, f.size.height);
 	}
 
 	void
@@ -154,6 +158,9 @@ namespace Reflex
 
 		if (styleMask != native.styleMask)
 			native.styleMask = styleMask;
+
+		if (native.hasFullScreenFlag != Xot::has_flag(flags, Window::FLAG_FULLSCREEN))
+			[native toggleFullScreen: native];
 	}
 
 	Screen

data/test/test_window.rb

@@ -121,6 +121,23 @@ class TestWindow < Test::Unit::TestCase
     assert_true  w.resizable?
   end
 
+  def test_fullscreen?()
+    w = win
+    assert_false w.fullscreen?
+
+    w.fullscreen = true
+    assert_true  w.fullscreen?
+
+    w.fullscreen = false
+    assert_false w.fullscreen?
+
+    w.fullscreen true
+    assert_true  w.fullscreen?
+
+    w.fullscreen false
+    assert_false w.fullscreen?
+  end
+
   def test_orientations()
     w = win
     assert_equal [], w.orientations

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reflexion
 version: !ruby/object:Gem::Version
-  version: 0.1.56
+  version: 0.1.57
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-07 00:00:00.000000000 Z
+date: 2024-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.41
+        version: 0.1.42
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.41
+        version: 0.1.42
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.43
+        version: 0.1.44
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.43
+        version: 0.1.44
 - !ruby/object:Gem::Dependency
   name: beeps
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.45
+        version: 0.1.46
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.45
+        version: 0.1.46
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.48
+        version: 0.1.49
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.48
+        version: 0.1.49
 description: This library helps you to develop interactive graphical user interface.
 email: xordog@gmail.com
 executables: []
@@ -425,7 +425,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: A Graphical User Interface Tool Kit.