code blocks changes

derwin12 · Feb 11, 2024 · efe7ba2 · efe7ba2
1 parent 07e980f
commit efe7ba2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/xLights/effects/TextPanel.cpp b/xLights/effects/TextPanel.cpp
@@ -268,6 +268,8 @@ TextPanel::TextPanel(wxWindow* parent) : xlEffectPanel(parent)
 	GridBagSizer6->Add(Slider_Text_YStart, wxGBPosition(0, 1), wxGBSpan(4, 1), wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
 	FlexGridSizer142->Add(GridBagSizer6, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
 	Panel16->SetSizer(FlexGridSizer142);
+	FlexGridSizer142->Fit(Panel16);
+	FlexGridSizer142->SetSizeHints(Panel16);
 	Panel17 = new wxPanel(Notebook6, IDD_PANEL17, wxPoint(104,13), wxDefaultSize, wxTAB_TRAVERSAL, _T("IDD_PANEL17"));
 	FlexGridSizer144 = new wxFlexGridSizer(0, 2, 0, 0);
 	FlexGridSizer144->AddGrowableCol(0);
@@ -292,13 +294,19 @@ TextPanel::TextPanel(wxWindow* parent) : xlEffectPanel(parent)
 	GridBagSizer7->Add(Slider_Text_YEnd, wxGBPosition(0, 1), wxGBSpan(4, 1), wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
 	FlexGridSizer144->Add(GridBagSizer7, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
 	Panel17->SetSizer(FlexGridSizer144);
+	FlexGridSizer144->Fit(Panel17);
+	FlexGridSizer144->SetSizeHints(Panel17);
 	Notebook6->AddPage(Panel16, _("Start Position"), false);
 	Notebook6->AddPage(Panel17, _("End Position"), false);
 	FlexGridSizer141->Add(Notebook6, 1, wxALL|wxEXPAND, 5);
 	FlexGridSizer69->Add(FlexGridSizer141, 1, wxALL|wxEXPAND, 1);
 	Panel_Text1->SetSizer(FlexGridSizer69);
+	FlexGridSizer69->Fit(Panel_Text1);
+	FlexGridSizer69->SetSizeHints(Panel_Text1);
 	FlexGridSizer46->Add(Panel_Text1, 1, wxALL|wxEXPAND, 5);
 	SetSizer(FlexGridSizer46);
+	FlexGridSizer46->Fit(this);
+	FlexGridSizer46->SetSizeHints(this);
 
 	Connect(ID_TEXTCTRL_Text,wxEVT_COMMAND_TEXT_UPDATED,(wxObjectEventFunction)&TextPanel::OnTextCtrl_TextText);
 	Connect(ID_FILEPICKERCTRL_Text_File,wxEVT_COMMAND_FILEPICKER_CHANGED,(wxObjectEventFunction)&TextPanel::OnFilePickerCtrl1FileChanged);

diff --git a/xLights/effects/TwinklePanel.cpp b/xLights/effects/TwinklePanel.cpp
@@ -113,6 +113,8 @@ TwinklePanel::TwinklePanel(wxWindow* parent) : xlEffectPanel(parent)
 	BitmapButton24->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNHIGHLIGHT));
 	FlexGridSizer4->Add(BitmapButton24, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
 	SetSizer(FlexGridSizer4);
+	FlexGridSizer4->Fit(this);
+	FlexGridSizer4->SetSizeHints(this);
 
 	Connect(ID_BITMAPBUTTON_SLIDER_Twinkle_Count,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&TwinklePanel::OnLockButtonClick);
 	Connect(ID_BITMAPBUTTON_SLIDER_Twinkle_Steps,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&TwinklePanel::OnLockButtonClick);

diff --git a/xLights/wxsmith/TextPanel.wxs b/xLights/wxsmith/TextPanel.wxs
@@ -217,7 +217,6 @@
 										<object class="sizeritem">
 											<object class="wxSlider" name="IDD_SLIDER_Text_Speed" subclass="BulkEditSlider" variable="Slider_Text_Speed" member="yes">
 												<value>10</value>
-												<max>50</max>
 											</object>
 											<flag>wxALL|wxEXPAND</flag>
 											<border>1</border>

diff --git a/xLights/wxsmith/TwinklePanel.wxs b/xLights/wxsmith/TwinklePanel.wxs
@@ -63,7 +63,7 @@
 				<object class="wxSlider" name="ID_SLIDER_Twinkle_Steps" subclass="BulkEditSlider" variable="Slider_Twinkle_Steps" member="yes">
 					<value>30</value>
 					<min>2</min>
-					<max>200</max>
+					<max>400</max>
 				</object>
 				<flag>wxALL|wxEXPAND</flag>
 				<border>5</border>