jx_layout_editor: fix so show/hide toolbar doesn't change layout size

jafl · Jan 27, 2024 · 888c4bf · 888c4bf
1 parent 32c65f1
commit 888c4bf
Show file tree

Hide file tree

Showing 51 changed files with 587 additions and 368 deletions.
diff --git a/libjx/code/JXAcceptLicenseDialog.cpp b/libjx/code/JXAcceptLicenseDialog.cpp
@@ -53,6 +53,11 @@ JXAcceptLicenseDialog::BuildWindow()
 					JXWidget::kHElastic, JXWidget::kVElastic, 20,20, 470,500);
 	assert( scrollbarSet != nullptr );
 
+	auto* text =
+		jnew JXStaticText(JGetString("LICENSE"), true, false, true, scrollbarSet, scrollbarSet->GetScrollEnclosure(),
+					JXWidget::kHElastic, JXWidget::kVElastic, 0,0, 470,500);
+	assert( text != nullptr );
+
 	auto* yesButton =
 		jnew JXTextButton(JGetString("yesButton::JXAcceptLicenseDialog::JXLayout"), window,
 					JXWidget::kFixedLeft, JXWidget::kFixedBottom, 100,540, 100,20);
@@ -66,11 +71,4 @@ JXAcceptLicenseDialog::BuildWindow()
 // end JXLayout
 
 	SetButtons(yesButton, noButton);
-
-	auto* text =
-		jnew JXStaticText(JGetString("LICENSE"), true, false, true,
-						 scrollbarSet, scrollbarSet->GetScrollEnclosure(),
-						 JXWidget::kHElastic, JXWidget::kVElastic, 0,0, 100,100);
-	assert( text != nullptr );
-	text->FitToEnclosure();
 }
diff --git a/libjx/code/JXAcceptLicenseDialog.jxl b/libjx/code/JXAcceptLicenseDialog.jxl
@@ -1,4 +1,4 @@
-jx_layout_editor 5
+jx_layout_editor 6
 510
 570
 "JXLayout"
@@ -18,6 +18,21 @@ jx_layout_editor 5
 0
 0
 
+1
+1
+"CustomWidget"
+2
+2
+0 0 485 455
+"text"
+0
+0
+0
+"JXStaticText"
+"JGetString(\"LICENSE\"), true, false, true, scrollbarSet"
+0
+""
+
 1
 0
 "TextButton"

diff --git a/libjx/code/JXOKToCloseDialog.cpp b/libjx/code/JXOKToCloseDialog.cpp
@@ -67,9 +67,9 @@ JXOKToCloseDialog::BuildWindow
 	icon->SetImage(GetDisplay()->GetImageCache()->GetImage(jx_un_warning), false);
 
 	auto* text =
-		jnew JXStaticText(JString::empty, window,
+		jnew JXStaticText(JString::empty, true, false, false, nullptr, window,
 					JXWidget::kHElastic, JXWidget::kVElastic, 60,20, 250,50);
-	text->SetToLabel(false);
+	assert( text != nullptr );
 
 	itsDiscardButton =
 		jnew JXTextButton(JGetString("itsDiscardButton::JXOKToCloseDialog::JXLayout"), window,

diff --git a/libjx/code/JXOKToCloseDialog.jxl b/libjx/code/JXOKToCloseDialog.jxl
@@ -1,4 +1,4 @@
-jx_layout_editor 5
+jx_layout_editor 6
 330
 110
 "JXLayout"
@@ -31,9 +31,9 @@ jx_layout_editor 5
 0
 0
 ""
-1
 0
 0
+1
 0
 0
 

diff --git a/libjx/code/JXPGDirectorBase.cpp b/libjx/code/JXPGDirectorBase.cpp
@@ -152,6 +152,7 @@ JXPGDirectorBase::Init
 	JXButton*		cancelButton
 	)
 {
+	window->SetTitle(JGetString("WindowTitle::JXPGDirectorBase"));
 	window->HideFromTaskbar();
 
 	// instantaneous redraw when Raise()

diff --git a/libjx/code/JXToolBar.cpp b/libjx/code/JXToolBar.cpp
@@ -64,8 +64,10 @@ const JUtf8Byte* JXToolBar::kIgnorePrefix = "__";
 
 // JBroadcaster message types
 
-const JUtf8Byte* JXToolBar::kWantsToDrop = "WantsToDrop::JXToolBar";
-const JUtf8Byte* JXToolBar::kHandleDrop  = "HandleDrop::JXToolBar";
+const JUtf8Byte* JXToolBar::kWantsToDrop      = "WantsToDrop::JXToolBar";
+const JUtf8Byte* JXToolBar::kHandleDrop       = "HandleDrop::JXToolBar";
+const JUtf8Byte* JXToolBar::kPrepareForResize = "PrepareForResize::JXToolBar";
+const JUtf8Byte* JXToolBar::kResizeFinished   = "ResizeFinished::JXToolBar";
 
 /******************************************************************************
  Constructor
@@ -96,6 +98,7 @@ JXToolBar::JXToolBar
 	itsWasShowingButtons(false),
 	itsButtonType(JXToolBarButton::kImage),
 	itsLoadedPrefs(false),
+	itsResizeCount(0),
 	itsUpgradeFn(nullptr)
 {
 	assert(h >= 40);
@@ -671,18 +674,6 @@ JXToolBar::FindItemAndAdd
 	return false;
 }
 
-/******************************************************************************
- IsEmpty (public)
-
- ******************************************************************************/
-
-bool
-JXToolBar::IsEmpty()
-	const
-{
-	return itsButtons->IsEmpty();
-}
-
 /******************************************************************************
  AdjustToolBarGeometry (public)
 
@@ -693,6 +684,8 @@ JXToolBar::AdjustToolBarGeometry()
 {
 	if (itsIsShowingButtons)
 	{
+		SendPrepareForResize();
+
 		RevertBar();
 
 		itsNextButtonPosition	= kButConBuffer;
@@ -709,6 +702,8 @@ JXToolBar::AdjustToolBarGeometry()
 
 		itsToolBarEnclosure->Place(0,itsToolBarSet->GetBoundsHeight());
 		itsToolBarEnclosure->SetSize(GetBoundsWidth(), GetBoundsHeight() - itsToolBarSet->GetBoundsHeight());
+
+		SendResizeFinished();
 	}
 }
 
@@ -908,6 +903,8 @@ JXToolBar::ShowToolBar
 {
 	if (show && !itsIsShowingButtons)
 	{
+		SendPrepareForResize();
+
 		itsToolBarSet->Show();
 		itsIsShowingButtons = true;
 		AdjustWindowMinSize();
@@ -919,9 +916,13 @@ JXToolBar::ShowToolBar
 		{
 			itsTimerTask->Start();
 		}
+
+		SendResizeFinished();
 	}
 	else if (!show && itsIsShowingButtons)
 	{
+		SendPrepareForResize();
+
 		itsToolBarSet->Hide();
 		itsIsShowingButtons = false;
 		AdjustWindowMinSize();
@@ -930,6 +931,40 @@ JXToolBar::ShowToolBar
 		itsToolBarEnclosure->SetSize(GetBoundsWidth(), GetBoundsHeight());
 
 		itsTimerTask->Stop();
+
+		SendResizeFinished();
+	}
+}
+
+/******************************************************************************
+ SendPrepareForResize (private)
+
+ ******************************************************************************/
+
+void
+JXToolBar::SendPrepareForResize()
+{
+	if (itsResizeCount == 0)
+	{
+		Broadcast(PrepareForResize());
+	}
+	itsResizeCount++;
+}
+
+/******************************************************************************
+ SendResizeFinished (private)
+
+ ******************************************************************************/
+
+void
+JXToolBar::SendResizeFinished()
+{
+	assert( itsResizeCount > 0 );
+
+	itsResizeCount--;
+	if (itsResizeCount == 0)
+	{
+		Broadcast(ResizeFinished());
 	}
 }