Traktor: Show "restore" icon to caption bar when form is maximized.

apistol78 · May 21, 2024 · ea39a56 · ea39a56
1 parent 90fe910
commit ea39a56
Show file tree

Hide file tree

Showing 3 changed files with 116 additions and 2 deletions.
diff --git a/code/Ui/CaptionBar.cpp b/code/Ui/CaptionBar.cpp
@@ -120,9 +120,13 @@ void CaptionBar::eventMouseMove(MouseMoveEvent* event)
 	if (!m_haveCapture)
 		return;
 
-	const Point position = getParent()->clientToScreen(event->getPosition());
+	Form* parentForm = dynamic_type_cast< Form* >(getAncestor());
+	if (!parentForm)
+		return;
+
+	const Point position = parentForm->clientToScreen(event->getPosition());
 	const Rect rc = m_parentRect.offset(position - m_mousePosition);
-	getParent()->setRect(rc);
+	parentForm->setRect(rc);
 
 	event->consume();
 }
@@ -142,8 +146,11 @@ void CaptionBar::eventSize(SizeEvent* event)
 	}
 
 	{
+		const Form* parentForm = dynamic_type_cast< const Form* >(getAncestor());
+		const bool maximized = (parentForm != nullptr) ? parentForm->isMaximized() : false;
 		const Size sz = m_buttonMaximizeOrRestore->getPreferredSize(Size(0, 0));
 		m_buttonMaximizeOrRestore->setRect({ Point(r - sz.cx, (h - sz.cy) / 2), Size(sz.cx, sz.cy) });
+		m_buttonMaximizeOrRestore->setImage(new ui::StyleBitmap(maximized ? L"UI.CaptionRestore" : L"UI.CaptionMaximize"));
 		r -= sz.cx + pad;
 	}
 

diff --git a/resources/runtime/themes/Shared/Images/UI/Restore.svg b/resources/runtime/themes/Shared/Images/UI/Restore.svg
diff --git a/resources/runtime/themes/Shared/StyleSheet.xss b/resources/runtime/themes/Shared/StyleSheet.xss
@@ -573,6 +573,10 @@
 			<first>UI.CaptionMaximize</first>
 			<second>$(Images.Path)/UI/Maximize.svg</second>
 		</item>
+		<item>
+			<first>UI.CaptionRestore</first>
+			<second>$(Images.Path)/UI/Restore.svg</second>
+		</item>
 		<item>
 			<first>UI.Checked</first>
 			<second>$(Images.Path)/UI/Checked.svg</second>