Skip to content

Commit

Permalink
#5707: Better control size/stretch behaviour
Browse files Browse the repository at this point in the history
  • Loading branch information
@codereader
codereader committed Aug 28, 2021
1 parent fe42f90 commit 405df3e
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
14 changes: 7 additions & 7 deletions install/ui/mergecontroldialog.fbp
View file
Expand Up @@ -1078,7 +1078,7 @@
<object class="sizeritem" expanded="1">
<property name="border">12</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bSizer13</property>
Expand All @@ -1087,7 +1087,7 @@
<object class="sizeritem" expanded="1">
<property name="border">0</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bSizer151</property>
Expand Down Expand Up @@ -2075,7 +2075,7 @@
<object class="sizeritem" expanded="1">
<property name="border">6</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
<property name="proportion">1</property>
<object class="wxPanel" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
Expand Down Expand Up @@ -2196,7 +2196,7 @@
<object class="sizeritem" expanded="1">
<property name="border">12</property>
<property name="flag">wxEXPAND|wxLEFT</property>
<property name="proportion">0</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bSizer261</property>
Expand Down Expand Up @@ -2266,7 +2266,7 @@
<object class="sizeritem" expanded="1">
<property name="border">0</property>
<property name="flag">wxEXPAND | wxALL</property>
<property name="proportion">0</property>
<property name="proportion">1</property>
<object class="wxPanel" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
Expand Down Expand Up @@ -2326,11 +2326,11 @@
</object>
</object>
</object>
<object class="sizeritem" expanded="0">
<object class="sizeritem" expanded="1">
<property name="border">0</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="0">
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bSizer272</property>
<property name="orient">wxHORIZONTAL</property>
Expand Down
10 changes: 5 additions & 5 deletions install/ui/mergecontroldialog.xrc
View file
Expand Up @@ -209,13 +209,13 @@
</object>
</object>
<object class="sizeritem">
<option>0</option>
<option>1</option>
<flag>wxALL|wxEXPAND</flag>
<border>12</border>
<object class="wxBoxSizer">
<orient>wxVERTICAL</orient>
<object class="sizeritem">
<option>0</option>
<option>1</option>
<flag>wxEXPAND</flag>
<border>0</border>
<object class="wxBoxSizer">
Expand Down Expand Up @@ -431,7 +431,7 @@
</object>
</object>
<object class="sizeritem">
<option>0</option>
<option>1</option>
<flag>wxEXPAND</flag>
<border>6</border>
<object class="wxPanel" name="ConflictDetailsPanel">
Expand All @@ -453,7 +453,7 @@
</object>
</object>
<object class="sizeritem">
<option>0</option>
<option>1</option>
<flag>wxEXPAND|wxLEFT</flag>
<border>12</border>
<object class="wxBoxSizer">
Expand All @@ -473,7 +473,7 @@
</object>
</object>
<object class="sizeritem">
<option>0</option>
<option>1</option>
<flag>wxEXPAND | wxALL</flag>
<border>0</border>
<object class="wxPanel" name="ActionDescriptionPanel">
Expand Down
2 changes: 1 addition & 1 deletion radiant/ui/merge/MergeControlDialog.cpp
View file
Expand Up @@ -115,7 +115,7 @@ MergeControlDialog::MergeControlDialog() :
listView->SetMinClientSize(wxSize(-1, 70));
listView->AppendTextColumn("-", COLUMNS().description.getColumnIndex(), wxDATAVIEW_CELL_INERT, wxCOL_WIDTH_AUTOSIZE);

actionDescriptionPanel->GetSizer()->Add(listView, 0, wxEXPAND | wxBOTTOM, 6);
actionDescriptionPanel->GetSizer()->Add(listView, 1, wxEXPAND | wxBOTTOM, 6);

updateControls();
Bind(wxEVT_IDLE, &MergeControlDialog::onIdle, this);
Expand Down

0 comments on commit 405df3e

Please sign in to comment.