Fix wxRibbonButtonBar's layout overall size computation.

徐扬斌 · 徐扬斌 · commit 0dedc6cd6af8 · 2024-05-06T13:57:45.000+08:00
Since we've already had CalculateOverallSize, we should avoid duplicate the error-prone algorithm here.
It has bug found by the assertion within TryCollapseLayout in our application.
diff --git a/src/ribbon/buttonbar.cpp b/src/ribbon/buttonbar.cpp
@@ -1066,7 +1066,6 @@ void wxRibbonButtonBar::MakeLayouts()
         //               small buttons small, stacked vertically
         wxRibbonButtonBarLayout* layout = new wxRibbonButtonBarLayout;
         wxPoint cursor(0, 0);
-        layout->overall_size.SetHeight(0);
         for(btn_i = 0; btn_i < btn_count; ++btn_i)
         {
             wxRibbonButtonBarButtonBase* button = m_buttons.Item(btn_i);
@@ -1102,8 +1101,7 @@ void wxRibbonButtonBar::MakeLayouts()
             }
             layout->buttons.Add(instance);
         }
-        layout->overall_size.SetHeight(available_height);
-        layout->overall_size.SetWidth(cursor.x + stacked_width);
+        layout->CalculateOverallSize();
         m_layouts.Add(layout);
     }
     if(btn_count >= 2)

Original file line number	Diff line number	Diff line change
`@@ -1066,7 +1066,6 @@ void wxRibbonButtonBar::MakeLayouts()`
`1066`	`1066`	`// small buttons small, stacked vertically`
`1067`	`1067`	`wxRibbonButtonBarLayout* layout = new wxRibbonButtonBarLayout;`
`1068`	`1068`	`wxPoint cursor(0, 0);`
`1069`		`- layout->overall_size.SetHeight(0);`
`1070`	`1069`	`for(btn_i = 0; btn_i < btn_count; ++btn_i)`
`1071`	`1070`	`{`
`1072`	`1071`	`wxRibbonButtonBarButtonBase* button = m_buttons.Item(btn_i);`
`@@ -1102,8 +1101,7 @@ void wxRibbonButtonBar::MakeLayouts()`
`1102`	`1101`	`}`
`1103`	`1102`	`layout->buttons.Add(instance);`
`1104`	`1103`	`}`
`1105`		`- layout->overall_size.SetHeight(available_height);`
`1106`		`- layout->overall_size.SetWidth(cursor.x + stacked_width);`
	`1104`	`+ layout->CalculateOverallSize();`
`1107`	`1105`	`m_layouts.Add(layout);`
`1108`	`1106`	`}`
`1109`	`1107`	`if(btn_count >= 2)`