jx_layout_editor: fix DND crash when dragging CoreWidget's

jafl · Apr 11, 2024 · 4c140dc · 4c140dc
1 parent 231e8bf
commit 4c140dc
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/tools/jx_layout_editor/code/HistoryMenu.cpp b/tools/jx_layout_editor/code/HistoryMenu.cpp
@@ -93,8 +93,8 @@ HistoryMenu::HistoryMenuX
 	)
 {
 	itsMenu = jnew JXTextMenu(JString::empty, this, kHElastic, kVElastic, x,y,w,h);
-	itsMenu->SetMenuItems(kMenuStr);
 	SetWidget(itsMenu);
+	itsMenu->SetMenuItems(kMenuStr);
 }
 
 /******************************************************************************

diff --git a/tools/jx_layout_editor/code/Menu.cpp b/tools/jx_layout_editor/code/Menu.cpp
@@ -99,8 +99,8 @@ Menu::MenuX
 	)
 {
 	itsMenu = jnew JXTextMenu(title, this, kHElastic, kVElastic, x,y,w,h);
-	itsMenu->SetMenuItems(kMenuStr);
 	SetWidget(itsMenu);
+	itsMenu->SetMenuItems(kMenuStr);
 }
 
 /******************************************************************************

diff --git a/tools/jx_layout_editor/code/ProgressIndicator.cpp b/tools/jx_layout_editor/code/ProgressIndicator.cpp
@@ -63,9 +63,9 @@ ProgressIndicator::ProgressIndicatorX
 	)
 {
 	itsWidget = jnew JXProgressIndicator(this, kHElastic, kVElastic, x,y,w,h);
+	SetWidget(itsWidget);
 	itsWidget->SetMaxValue(10);
 	itsWidget->SetValue(4);
-	SetWidget(itsWidget);
 }
 
 /******************************************************************************

diff --git a/tools/jx_layout_editor/code/Slider.cpp b/tools/jx_layout_editor/code/Slider.cpp
@@ -78,10 +78,10 @@ Slider::SliderX
 	{
 		itsWidget = jnew JXSlider(this, kHElastic, kVElastic, x,y,w,h);
 	}
+	SetWidget(itsWidget);
 
 	itsWidget->SetMaxValue(10);
 	itsWidget->SetValue(4);
-	SetWidget(itsWidget);
 }
 
 /******************************************************************************

diff --git a/tools/jx_layout_editor/code/StaticText.cpp b/tools/jx_layout_editor/code/StaticText.cpp
@@ -99,8 +99,8 @@ StaticText::StaticTextX
 {
 	itsText = jnew JXStaticText(text, itsWordWrapFlag, false, false, nullptr,
 								this, kHElastic, kVElastic, x,y,w,h);
-	itsText->SetBorderWidth(0);
 	SetWidget(itsText);
+	itsText->SetBorderWidth(0);
 
 	if (itsIsLabelFlag)
 	{

diff --git a/tools/jx_layout_editor/release/doc/ChangeLog.html b/tools/jx_layout_editor/release/doc/ChangeLog.html
@@ -13,6 +13,13 @@ <h1>JX Layout Editor: Changes from previous versions</h1>
 <p>Please submit all suggestions and bugs via <a href="https://github.com/jafl/jx_application_framework/issues">github</a>.</p>
 <hr>
 
+<h2>4.2</h2>
+
+<ul>
+	<li>Fixed drag-and-drop crash when some widgets were copied.</li>
+</ul>
+
+
 <h2>4.1</h2>
 
 <ul>