reflexion 0.1.39 → 0.1.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a2bf359950c676836ffec40bf02fda296c2111f09cf585ad546b0ecc8edc296
-  data.tar.gz: 2366d63f0d4512bf3f71cf1a16e355f4b98123f7473bdfa5f8d95bdbf87536aa
+  metadata.gz: b412c2e913baaeacdd4afff628c339c01a6ce7359572901d6193fc97d772a426
+  data.tar.gz: f8cba434ac873919a9bd75ea5c5e08d0436eb672313e60541d5634b210b81b76
 SHA512:
-  metadata.gz: 33e83a7603fa2749030b58d321d5ee9a808283095d43dc7c5772a6890d1758abe2993d7392f7f820c83eeb9b2fecea690ded0e4dc8689c8815b4397870429229
-  data.tar.gz: 7d604628381cf76bed34cae3126739d5658d007c6924ef3d6ce0e7459476a4513099b7f61932f6aa82110a1458ee73c508b59719d6049f37e97dcffb710caf9f
+  metadata.gz: 7b6f7fd46e08e459010a98facf5c8e800c326f93d0482b0649c4f20a6bc54537947e5e3316285db7e759870c7739c68ab5284fba8f4640fb88e5dc02c106b598
+  data.tar.gz: a30e5f7bde2f8f9b09ff0e76847d2bbbfefe9187e3888224409ebfe04a72c05e36387ab4a976f0dd385f1ead5aa749d1ba8478182030e73058879792b0ca051e

data/.doc/ext/reflex/native.cpp

@@ -32,6 +32,7 @@ void Init_reflex_rect_shape ();
 void Init_reflex_ellipse_shape ();
 
 void Init_reflex_application ();
+void Init_reflex_screen ();
 void Init_reflex_window ();
 void Init_reflex_view ();
 
@@ -80,6 +81,7 @@ extern "C" void
 	Init_reflex_ellipse_shape();
 
 	Init_reflex_application();
+	Init_reflex_screen();
 	Init_reflex_window();
 	Init_reflex_view();
 

data/.doc/ext/reflex/screen.cpp

@@ -0,0 +1,53 @@
+#include "reflex/ruby/screen.h"
+
+
+#include <rays/ruby/bounds.h>
+#include "defs.h"
+
+
+RUCY_DEFINE_VALUE_FROM_TO(Reflex::Screen)
+
+#define THIS  to<Reflex::Screen*>(self)
+
+#define CHECK RUCY_CHECK_OBJECT(Reflex::Screen, self)
+
+
+static
+VALUE alloc(VALUE klass)
+{
+	Reflex::reflex_error(__FILE__, __LINE__, "can not instantiate Screen class.");
+}
+
+static
+VALUE get_frame(VALUE self)
+{
+	CHECK;
+	return value(THIS->frame());
+}
+
+
+static Class cScreen;
+
+void
+Init_reflex_screen ()
+{
+	Module mReflex = rb_define_module("Reflex");
+
+	cScreen = rb_define_class_under(mReflex, "Screen", rb_cObject);
+	rb_define_alloc_func(cScreen, alloc);
+	rb_define_method(cScreen, "frame", RUBY_METHOD_FUNC(get_frame), 0);
+}
+
+
+namespace Reflex
+{
+
+
+	Class
+	screen_class ()
+	{
+		return cScreen;
+	}
+
+
+}// Reflex

data/.doc/ext/reflex/view.cpp

@@ -617,6 +617,26 @@ VALUE get_scroll_to_fit(VALUE self)
 	return value(THIS->has_flag(Reflex::View::FLAG_SCROLL_TO_FIT));
 }
 
+static
+VALUE set_fix_angle(VALUE self, VALUE fix)
+{
+	CHECK;
+
+	if (fix)
+		THIS->   add_flag(Reflex::View::FLAG_FIX_ANGLE);
+	else
+		THIS->remove_flag(Reflex::View::FLAG_FIX_ANGLE);
+
+	return fix;
+}
+
+static
+VALUE get_fix_angle(VALUE self)
+{
+	CHECK;
+	return value(THIS->has_flag(Reflex::View::FLAG_FIX_ANGLE));
+}
+
 static
 VALUE parent(VALUE self)
 {
@@ -1134,6 +1154,8 @@ Init_reflex_view ()
 	cView.define_method("resize_to_fit?", get_resize_to_fit);
 	rb_define_method(cView, "scroll_to_fit=", RUBY_METHOD_FUNC(set_scroll_to_fit), 1);
 	cView.define_method("scroll_to_fit?", get_scroll_to_fit);
+	rb_define_method(cView, "fix_angle=", RUBY_METHOD_FUNC(set_fix_angle), 1);
+	cView.define_method("fix_angle?", get_fix_angle);
 	rb_define_method(cView, "parent", RUBY_METHOD_FUNC(parent), 0);
 	rb_define_method(cView, "window", RUBY_METHOD_FUNC(window), 0);
 

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

@@ -3,6 +3,7 @@
 
 #include <rays/ruby/bounds.h>
 #include <rays/ruby/painter.h>
+#include "reflex/ruby/screen.h"
 #include "reflex/ruby/view.h"
 #include "defs.h"
 
@@ -38,6 +39,13 @@ VALUE hide(VALUE self)
 	return self;
 }
 
+static
+VALUE hidden(VALUE self)
+{
+	CHECK;
+	return value(THIS->hidden());
+}
+
 static
 VALUE close(VALUE self)
 {
@@ -98,44 +106,89 @@ VALUE get_frame(VALUE self)
 	return value(THIS->frame());
 }
 
+static
+VALUE set_closable(VALUE self, VALUE state)
+{
+	CHECK;
+
+	if (state)
+		THIS->   add_flag(Reflex::Window::FLAG_CLOSABLE);
+	else
+		THIS->remove_flag(Reflex::Window::FLAG_CLOSABLE);
+
+	return state;
+}
+
+static
+VALUE is_closable(VALUE self)
+{
+	CHECK;
+	return value(THIS->has_flag(Reflex::Window::FLAG_CLOSABLE));
+}
+
+static
+VALUE set_minimizable(VALUE self, VALUE state)
+{
+	CHECK;
+
+	if (state)
+		THIS->   add_flag(Reflex::Window::FLAG_MINIMIZABLE);
+	else
+		THIS->remove_flag(Reflex::Window::FLAG_MINIMIZABLE);
+
+	return state;
+}
+
+static
+VALUE is_minimizable(VALUE self)
+{
+	CHECK;
+	return value(THIS->has_flag(Reflex::Window::FLAG_MINIMIZABLE));
+}
+
 static
 VALUE set_resizable(VALUE self, VALUE state)
 {
 	CHECK;
-	THIS->set_resizable(to<bool>(state));
-	return value(THIS->is_resizable());
+
+	if (state)
+		THIS->   add_flag(Reflex::Window::FLAG_RESIZABLE);
+	else
+		THIS->remove_flag(Reflex::Window::FLAG_RESIZABLE);
+
+	return state;
 }
 
 static
 VALUE is_resizable(VALUE self)
 {
 	CHECK;
-	return value(THIS->is_resizable());
+	return value(THIS->has_flag(Reflex::Window::FLAG_RESIZABLE));
 }
 
 static
-VALUE hidden(VALUE self)
+VALUE get_screen(VALUE self)
 {
 	CHECK;
-	return value(THIS->hidden());
+	return value(THIS->screen());
 }
 
 static
-VALUE root(VALUE self)
+VALUE get_root(VALUE self)
 {
 	CHECK;
 	return value(THIS->root());
 }
 
 static
-VALUE focus(VALUE self)
+VALUE get_focus(VALUE self)
 {
 	CHECK;
 	return value(THIS->focus());
 }
 
 static
-VALUE painter(VALUE self)
+VALUE get_painter(VALUE self)
 {
 	CHECK;
 	return value(THIS->painter());
@@ -277,12 +330,17 @@ Init_reflex_window ()
 	rb_define_method(cWindow, "title", RUBY_METHOD_FUNC(get_title), 0);
 	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);
+	rb_define_method(cWindow, "minimizable=", RUBY_METHOD_FUNC(set_minimizable), 1);
+	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, "hidden", RUBY_METHOD_FUNC(hidden), 0);
-	rb_define_method(cWindow, "root", RUBY_METHOD_FUNC(root), 0);
-	rb_define_method(cWindow, "focus", RUBY_METHOD_FUNC(focus), 0);
-	rb_define_method(cWindow, "painter", RUBY_METHOD_FUNC(painter), 0);
+	rb_define_method(cWindow, "screen", RUBY_METHOD_FUNC(get_screen), 0);
+	rb_define_method(cWindow, "root", RUBY_METHOD_FUNC(get_root), 0);
+	rb_define_method(cWindow, "focus", RUBY_METHOD_FUNC(get_focus), 0);
+	rb_define_method(cWindow, "painter", RUBY_METHOD_FUNC(get_painter), 0);
 	rb_define_method(cWindow, "on_show", RUBY_METHOD_FUNC(on_show), 1);
 	rb_define_method(cWindow, "on_hide", RUBY_METHOD_FUNC(on_hide), 1);
 	rb_define_method(cWindow, "on_close", RUBY_METHOD_FUNC(on_close), 1);

data/ChangeLog.md

@@ -1,6 +1,21 @@
 # reflex ChangeLog
 
 
+## [v0.1.41] - 2023-05-29
+
+- Add Reflex::Screen class
+- Add Window#closable and Window#minimizable accessors
+- Fix that non-closable, non-minimizable, or non-resizable buttons raise error on clicking them
+
+
+## [v0.1.40] - 2023-05-27
+
+- required_ruby_version >= 3.0.0
+- Add FLAG_FIX_ANGLE
+- Add spec.license
+- Fix crash on calling ContactEvent#inspect
+
+
 ## [v0.1.39] - 2023-05-18
 
 - Event#block has a bool parameter, which defaults to true

data/VERSION

@@ -1 +1 @@
-0.1.39
+0.1.41

data/ext/reflex/native.cpp

@@ -32,6 +32,7 @@ void Init_reflex_rect_shape ();
 void Init_reflex_ellipse_shape ();
 
 void Init_reflex_application ();
+void Init_reflex_screen ();
 void Init_reflex_window ();
 void Init_reflex_view ();
 
@@ -80,6 +81,7 @@ extern "C" void
 	Init_reflex_ellipse_shape();
 
 	Init_reflex_application();
+	Init_reflex_screen();
 	Init_reflex_window();
 	Init_reflex_view();
 

data/ext/reflex/screen.cpp

@@ -0,0 +1,55 @@
+#include "reflex/ruby/screen.h"
+
+
+#include <rays/ruby/bounds.h>
+#include "defs.h"
+
+
+RUCY_DEFINE_VALUE_FROM_TO(Reflex::Screen)
+
+#define THIS  to<Reflex::Screen*>(self)
+
+#define CHECK RUCY_CHECK_OBJECT(Reflex::Screen, self)
+
+
+static
+RUCY_DEF_ALLOC(alloc, klass)
+{
+	Reflex::reflex_error(__FILE__, __LINE__, "can not instantiate Screen class.");
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_frame)
+{
+	CHECK;
+	return value(THIS->frame());
+}
+RUCY_END
+
+
+static Class cScreen;
+
+void
+Init_reflex_screen ()
+{
+	Module mReflex = define_module("Reflex");
+
+	cScreen = mReflex.define_class("Screen");
+	cScreen.define_alloc_func(alloc);
+	cScreen.define_method("frame", get_frame);
+}
+
+
+namespace Reflex
+{
+
+
+	Class
+	screen_class ()
+	{
+		return cScreen;
+	}
+
+
+}// Reflex

data/ext/reflex/view.cpp

@@ -675,6 +675,28 @@ RUCY_DEF0(get_scroll_to_fit)
 }
 RUCY_END
 
+static
+RUCY_DEF1(set_fix_angle, fix)
+{
+	CHECK;
+
+	if (fix)
+		THIS->   add_flag(Reflex::View::FLAG_FIX_ANGLE);
+	else
+		THIS->remove_flag(Reflex::View::FLAG_FIX_ANGLE);
+
+	return fix;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_fix_angle)
+{
+	CHECK;
+	return value(THIS->has_flag(Reflex::View::FLAG_FIX_ANGLE));
+}
+RUCY_END
+
 static
 RUCY_DEF0(parent)
 {
@@ -1206,25 +1228,25 @@ Init_reflex_view ()
 	cView.define_method("from_screen", from_screen);
 	cView.define_method(  "to_screen",   to_screen);
 
-	cView.define_method("add_child",      add_child);
+	cView.define_method(   "add_child",      add_child);
 	cView.define_method("remove_child",   remove_child);
-	cView.define_method("clear_children", clear_children);
-	cView.define_method("find_children",  find_children);
-	cView.define_method("each_child",     each_child);
+	cView.define_method( "clear_children", clear_children);
+	cView.define_method(  "find_children",  find_children);
+	cView.define_method(  "each_child",     each_child);
 
-	cView.define_method("add_style",    add_style);
+	cView.define_method(   "add_style",    add_style);
 	cView.define_method("remove_style", remove_style);
-	cView.define_method("get_style",    get_style);
-	cView.define_method("find_styles",  find_styles);
-	cView.define_method("each_style",   each_style);
+	cView.define_method(   "get_style",    get_style);
+	cView.define_method(  "find_styles",  find_styles);
+	cView.define_method(  "each_style",   each_style);
 
-	cView.define_method("shape=",       set_shape);
-	cView.define_method("shape",        get_shape);
-	cView.define_method("add_shape",    add_shape);
+	cView.define_method(       "shape=",   set_shape);
+	cView.define_method(       "shape",    get_shape);
+	cView.define_method(   "add_shape",    add_shape);
 	cView.define_method("remove_shape", remove_shape);
-	cView.define_method("clear_shapes", clear_shapes);
-	cView.define_method("find_shapes",  find_shapes);
-	cView.define_method("each_shape",   each_shape);
+	cView.define_method( "clear_shapes", clear_shapes);
+	cView.define_method(  "find_shapes",  find_shapes);
+	cView.define_method(  "each_shape",   each_shape);
 
 	cView.define_method("filter=", set_filter);
 	cView.define_method("filter",  get_filter);
@@ -1252,6 +1274,8 @@ Init_reflex_view ()
 	cView.define_method("resize_to_fit?", get_resize_to_fit);
 	cView.define_method("scroll_to_fit=", set_scroll_to_fit);
 	cView.define_method("scroll_to_fit?", get_scroll_to_fit);
+	cView.define_method("fix_angle=", set_fix_angle);
+	cView.define_method("fix_angle?", get_fix_angle);
 	cView.define_method("parent", parent);
 	cView.define_method("window", window);
 

data/ext/reflex/window.cpp

@@ -3,6 +3,7 @@
 
 #include <rays/ruby/bounds.h>
 #include <rays/ruby/painter.h>
+#include "reflex/ruby/screen.h"
 #include "reflex/ruby/view.h"
 #include "defs.h"
 
@@ -41,6 +42,14 @@ RUCY_DEF0(hide)
 }
 RUCY_END
 
+static
+RUCY_DEF0(hidden)
+{
+	CHECK;
+	return value(THIS->hidden());
+}
+RUCY_END
+
 static
 RUCY_DEF0(close)
 {
@@ -109,12 +118,61 @@ RUCY_DEF0(get_frame)
 }
 RUCY_END
 
+static
+RUCY_DEF1(set_closable, state)
+{
+	CHECK;
+
+	if (state)
+		THIS->   add_flag(Reflex::Window::FLAG_CLOSABLE);
+	else
+		THIS->remove_flag(Reflex::Window::FLAG_CLOSABLE);
+
+	return state;
+}
+RUCY_END
+
+static
+RUCY_DEF0(is_closable)
+{
+	CHECK;
+	return value(THIS->has_flag(Reflex::Window::FLAG_CLOSABLE));
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_minimizable, state)
+{
+	CHECK;
+
+	if (state)
+		THIS->   add_flag(Reflex::Window::FLAG_MINIMIZABLE);
+	else
+		THIS->remove_flag(Reflex::Window::FLAG_MINIMIZABLE);
+
+	return state;
+}
+RUCY_END
+
+static
+RUCY_DEF0(is_minimizable)
+{
+	CHECK;
+	return value(THIS->has_flag(Reflex::Window::FLAG_MINIMIZABLE));
+}
+RUCY_END
+
 static
 RUCY_DEF1(set_resizable, state)
 {
 	CHECK;
-	THIS->set_resizable(to<bool>(state));
-	return value(THIS->is_resizable());
+
+	if (state)
+		THIS->   add_flag(Reflex::Window::FLAG_RESIZABLE);
+	else
+		THIS->remove_flag(Reflex::Window::FLAG_RESIZABLE);
+
+	return state;
 }
 RUCY_END
 
@@ -122,20 +180,20 @@ static
 RUCY_DEF0(is_resizable)
 {
 	CHECK;
-	return value(THIS->is_resizable());
+	return value(THIS->has_flag(Reflex::Window::FLAG_RESIZABLE));
 }
 RUCY_END
 
 static
-RUCY_DEF0(hidden)
+RUCY_DEF0(get_screen)
 {
 	CHECK;
-	return value(THIS->hidden());
+	return value(THIS->screen());
 }
 RUCY_END
 
 static
-RUCY_DEF0(root)
+RUCY_DEF0(get_root)
 {
 	CHECK;
 	return value(THIS->root());
@@ -143,7 +201,7 @@ RUCY_DEF0(root)
 RUCY_END
 
 static
-RUCY_DEF0(focus)
+RUCY_DEF0(get_focus)
 {
 	CHECK;
 	return value(THIS->focus());
@@ -151,7 +209,7 @@ RUCY_DEF0(focus)
 RUCY_END
 
 static
-RUCY_DEF0(painter)
+RUCY_DEF0(get_painter)
 {
 	CHECK;
 	return value(THIS->painter());
@@ -310,12 +368,17 @@ Init_reflex_window ()
 	cWindow.define_method("title", get_title);
 	cWindow.define_method("frame=", set_frame);
 	cWindow.define_method("frame",  get_frame);
-	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("hidden", hidden);
-	cWindow.define_method("root", root);
-	cWindow.define_method("focus", focus);
-	cWindow.define_method("painter", painter);
+	cWindow.define_method("screen",  get_screen);
+	cWindow.define_method("root",    get_root);
+	cWindow.define_method("focus",   get_focus);
+	cWindow.define_method("painter", get_painter);
 	cWindow.define_method("on_show",  on_show);
 	cWindow.define_method("on_hide",  on_hide);
 	cWindow.define_method("on_close", on_close);

data/include/reflex/ruby/screen.h

@@ -0,0 +1,40 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_RUBY_SCREEN_H__
+#define __REFLEX_RUBY_SCREEN_H__
+
+
+#include <rucy/class.h>
+#include <rucy/extension.h>
+#include <reflex/screen.h>
+
+
+RUCY_DECLARE_VALUE_FROM_TO(Reflex::Screen)
+
+
+namespace Reflex
+{
+
+
+	Rucy::Class screen_class ();
+	// class Reflex::Screen
+
+
+}// Reflex
+
+
+namespace Rucy
+{
+
+
+	template <> inline Class
+	get_ruby_class<Reflex::Screen> ()
+	{
+		return Reflex::screen_class();
+	}
+
+
+}// Rucy
+
+
+#endif//EOH

data/include/reflex/screen.h

@@ -0,0 +1,43 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_SCREEN_H__
+#define __REFLEX_SCREEN_H__
+
+
+#include <xot/pimpl.h>
+#include <rays/bounds.h>
+#include <reflex/defs.h>
+
+
+namespace Reflex
+{
+
+
+	class Screen
+	{
+
+		typedef Screen This;
+
+		public:
+
+			Screen ();
+
+			virtual ~Screen ();
+
+			virtual Bounds frame () const;
+
+			operator bool () const;
+
+			bool operator ! () const;
+
+			struct Data;
+
+			Xot::PSharedImpl<Data> self;
+
+	};// Screen
+
+
+}// Reflex
+
+
+#endif//EOH

data/include/reflex/view.h

@@ -67,7 +67,9 @@ namespace Reflex
 
 				FLAG_SCROLL_TO_FIT  = Xot::bit(3),
 
-				FLAG_LAST           = FLAG_SCROLL_TO_FIT
+				FLAG_FIX_ANGLE      = Xot::bit(4),
+
+				FLAG_LAST           = FLAG_FIX_ANGLE
 
 			};// Flag