Introduce a IWindow::E_CREATE_FLAGS::ECF_CAN_RESIZE and change meaning of IWindow::E_CREATE_FLAGS::ECF_RESIZABLE

Author: devshgraphicsprogramming

examples_tests

@@ -38,6 +38,8 @@ class IWindow : public core::IReferenceCounted
             ECF_CAN_MAXIMIZE = 1u << 10,
             //! If disabled, the minimize button is grayed out
             ECF_CAN_MINIMIZE = 1u << 11,
+            //! If disabled, the window can't be resized via the UI, only programmatically
+            ECF_CAN_RESIZE = 1u << 12,
 
             ECF_NONE = 0
         };
@@ -171,17 +173,18 @@ class IWindow : public core::IReferenceCounted
         friend class IEventCallback;
         inline void setEventCallback(core::smart_refctd_ptr<IEventCallback>&& evCb) { m_cb = std::move(evCb); }
 
-        inline bool isFullscreen()        { return (m_flags.value & ECF_FULLSCREEN); }
-        inline bool isHidden()            { return (m_flags.value & ECF_HIDDEN); }
-        inline bool isBorderless()        { return (m_flags.value & ECF_BORDERLESS); }
-        inline bool isResizable()         { return (m_flags.value & ECF_RESIZABLE); }
-        inline bool isMinimized()         { return (m_flags.value & ECF_MINIMIZED); }
-        inline bool isMaximized()         { return (m_flags.value & ECF_MAXIMIZED); }
-        inline bool hasMouseCaptured()    { return (m_flags.value & ECF_MOUSE_CAPTURE); }
-        inline bool hasInputFocus()       { return (m_flags.value & ECF_INPUT_FOCUS); }
-        inline bool hasMouseFocus()       { return (m_flags.value & ECF_MOUSE_FOCUS); }
-        inline bool isAlwaysOnTop()       { return (m_flags.value & ECF_ALWAYS_ON_TOP); }
-        inline bool isMaximizable()       { return (m_flags.value & ECF_CAN_MAXIMIZE); }
+        inline bool isFullscreen()              { return (m_flags.value & ECF_FULLSCREEN); }
+        inline bool isHidden()                  { return (m_flags.value & ECF_HIDDEN); }
+        inline bool isBorderless()              { return (m_flags.value & ECF_BORDERLESS); }
+        inline bool canProgrammaticallyResize() { return (m_flags.value & ECF_RESIZABLE); }
+        inline bool isMinimized()               { return (m_flags.value & ECF_MINIMIZED); }
+        inline bool isMaximized()               { return (m_flags.value & ECF_MAXIMIZED); }
+        inline bool hasMouseCaptured()          { return (m_flags.value & ECF_MOUSE_CAPTURE); }
+        inline bool hasInputFocus()             { return (m_flags.value & ECF_INPUT_FOCUS); }
+        inline bool hasMouseFocus()             { return (m_flags.value & ECF_MOUSE_FOCUS); }
+        inline bool isAlwaysOnTop()             { return (m_flags.value & ECF_ALWAYS_ON_TOP); }
+        inline bool isMaximizable()             { return (m_flags.value & ECF_CAN_MAXIMIZE); }
+        inline bool isResizable()               { return (m_flags.value & ECF_CAN_RESIZE); }
 
         inline core::bitflag<E_CREATE_FLAGS> getFlags() { return m_flags; }
 

include/nbl/ui/IWindow.h

@@ -25,7 +25,7 @@ class NBL_API2 IWindowManager : public virtual core::IReferenceCounted
 		inline bool setWindowSize(IWindow* window, const uint32_t width, const uint32_t height)
 		{
 			auto cb = window->getEventCallback();
-			if (window->getManager() != this || !window->isResizable())
+			if (window->getManager()!=this || !window->canProgrammaticallyResize())
 				return false;
 
 			return setWindowSize_impl(window, width, height);
@@ -34,7 +34,7 @@ class NBL_API2 IWindowManager : public virtual core::IReferenceCounted
 		inline bool setWindowPosition(IWindow* window, const int32_t x, const int32_t y)
 		{
 			auto cb = window->getEventCallback();
-			if (window->getManager() != this || !window->isResizable())
+			if (window->getManager()!=this)
 				return false;
 
 			return setWindowPosition_impl(window, x, y);
@@ -56,7 +56,7 @@ class NBL_API2 IWindowManager : public virtual core::IReferenceCounted
 		inline bool show(IWindow* window)
 		{
 			auto cb = window->getEventCallback();
-			if (window->getManager() != this || !window->isResizable() || !window->isHidden())
+			if (window->getManager() != this || !window->isHidden())
 				return false;
 
 			return setWindowVisible_impl(window, true);
@@ -65,7 +65,7 @@ class NBL_API2 IWindowManager : public virtual core::IReferenceCounted
 		inline bool hide(IWindow* window)
 		{
 			auto cb = window->getEventCallback();
-			if (window->getManager() != this || !window->isResizable() || window->isHidden())
+			if (window->getManager() != this || window->isHidden())
 				return false;
 
 			return setWindowVisible_impl(window, false);
@@ -74,7 +74,7 @@ class NBL_API2 IWindowManager : public virtual core::IReferenceCounted
 		inline bool maximize(IWindow* window)
 		{
 			auto cb = window->getEventCallback();
-			if (window->getManager() != this || !window->isResizable() || window->isMaximized())
+			if (window->getManager() != this || window->isMaximized())
 				return false;
 
 			return setWindowMaximized_impl(window, true);
@@ -83,7 +83,7 @@ class NBL_API2 IWindowManager : public virtual core::IReferenceCounted
 		inline bool minimize(IWindow* window)
 		{
 			auto cb = window->getEventCallback();
-			if (window->getManager() != this || !window->isResizable() || window->isMinimized())
+			if (window->getManager() != this || window->isMinimized())
 				return false;
 
 			return setWindowMaximized_impl(window, false);

include/nbl/ui/IWindowManager.h

@@ -58,7 +58,7 @@ static inline DWORD getWindowStyle(const core::bitflag<IWindow::E_CREATE_FLAGS>
 		style |= WS_VISIBLE;
 	}
 	style |= WS_OVERLAPPEDWINDOW;
-	if (!flags.hasFlags(IWindow::ECF_RESIZABLE))
+	if (!flags.hasFlags(IWindow::ECF_CAN_RESIZE))
 	{
 		style &= ~WS_SIZEBOX;
 	}
@@ -76,6 +76,13 @@ static inline DWORD getWindowStyle(const core::bitflag<IWindow::E_CREATE_FLAGS>
 
 core::smart_refctd_ptr<IWindow> CWindowManagerWin32::createWindow(IWindow::SCreationParams&& creationParams)
 {
+	// this could be common to all `createWindow` impl
+	if (creationParams.flags.hasFlags(IWindow::ECF_CAN_RESIZE) || creationParams.flags.hasFlags(IWindow::ECF_CAN_MAXIMIZE))
+		creationParams.flags |= IWindow::ECF_RESIZABLE;
+	// win32 minimize is weird, its a resize to 0,0
+	if (creationParams.flags.hasFlags(IWindow::ECF_CAN_MINIMIZE))
+		creationParams.flags |= IWindow::ECF_CAN_RESIZE;
+
 	CAsyncQueue::future_t<IWindowWin32::native_handle_t> future;
 	m_windowThreadManager.request(&future, SRequestParams_CreateWindow{
 		.windowCaption = std::move(creationParams.windowCaption),
@@ -84,7 +91,7 @@ core::smart_refctd_ptr<IWindow> CWindowManagerWin32::createWindow(IWindow::SCrea
 		.x = creationParams.x,
 		.y = creationParams.y,
 		.flags = creationParams.flags
-		});
+	});
 	if (auto handle = future.acquire())
 		return core::make_smart_refctd_ptr<CWindowWin32>(std::move(creationParams),core::smart_refctd_ptr<CWindowManagerWin32>(this),*handle);
 	return nullptr;