Skip to content

Use TableLayoutPanel and FlowLayoutPanel for InsertEntryDlg layout #781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasonleenaylor merged 1 commit into from
Mar 24, 2026
Merged

Use TableLayoutPanel and FlowLayoutPanel for InsertEntryDlg layout #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 86 additions & 12 deletions Src/LexText/LexTextControls/InsertEntryDlg.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ public enum MorphTypeFilterType
private ToolTip m_toolTipSlotCombo;
private MSAGroupBox m_msaGroupBox;
private IContainer components = null;
private TableLayoutPanel m_tableLayoutPanel;
private FlowLayoutPanel m_buttonPanel;
private FlowLayoutPanel m_glossFlowLayout;

private string s_helpTopic = "khtpInsertEntry";
private LinkLabel m_linkSimilarEntry;
Expand Down Expand Up @@ -628,7 +631,8 @@ protected void SetDlgInfo(LcmCache cache, IMoMorphType morphType, int wsVern, Mo
if (WritingSystemServices.GetWritingSystemList(m_cache, WritingSystemServices.kwsAnals, false).Count > 1)
{
msGloss = ReplaceTextBoxWithMultiStringBox(m_tbGloss, WritingSystemServices.kwsAnals, stylesheet);
m_lnkAssistant.Top = msGloss.Bottom - m_lnkAssistant.Height;
// Vertically align the link to the bottom of the multi-string control within the FlowLayoutPanel
m_lnkAssistant.Margin = new Padding(3, msGloss.Height - m_lnkAssistant.Height, 3, 0);
msGloss.TextChanged += tbGloss_TextChanged;
}
else
Expand Down Expand Up @@ -784,7 +788,13 @@ private LabeledMultiStringControl ReplaceTextBoxWithMultiStringBox(FwTextBox tb,

int oldHeight = tb.Parent.Height;
FontHeightAdjuster.GrowDialogAndAdjustControls(tb.Parent, ms.Height - tb.Height, ms);
tb.Parent.Controls.Add(ms);
var parent = tb.Parent;
parent.Controls.Add(ms);
// Keep the new control in the same position as the original in the parent's
// Controls collection. This matters when the parent is a FlowLayoutPanel,
// because Controls order determines visual order; without this, the replacement
// control ends up at the end and the neighbouring controls swap sides.
parent.Controls.SetChildIndex(ms, parent.Controls.GetChildIndex(tb));

// Grow the dialog and move all lower controls down to make room.
GrowDialogAndAdjustControls(tb.Parent.Height - oldHeight, tb.Parent);
Expand Down Expand Up @@ -827,7 +837,12 @@ public void SetDlgInfo(LcmCache cache, ITsString tssForm, Mediator mediator, XCo
Mediator = mediator;
if (m_propertyTable.GetStringProperty("currentContentControl", null) != "lexiconEdit")
{
this.Controls.Add(this.m_btnCreateAndEdit);
// Insert between Create (index 2) and Cancel (index 1) in the RightToLeft flow.
// RightToLeft order: Help(0), Cancel(1), Create(2)
// After insert at index 2: Help(0), Cancel(1), CreateAndEdit(2), Create(3)
// Display left-to-right: Create | CreateAndEdit | Cancel | Help
m_buttonPanel.Controls.Add(m_btnCreateAndEdit);
m_buttonPanel.Controls.SetChildIndex(m_btnCreateAndEdit, 2);
}
var morphComponents = MorphServices.BuildMorphComponents(cache, tssForm, MoMorphTypeTags.kguidMorphStem);
var morphType = morphComponents.MorphType;
Expand Down Expand Up @@ -1095,12 +1110,18 @@ private void InitializeComponent()
this.m_propsGroupBox = new System.Windows.Forms.GroupBox();
this.m_complexTypeLabel = new System.Windows.Forms.Label();
this.m_glossGroupBox = new System.Windows.Forms.GroupBox();
this.m_glossFlowLayout = new System.Windows.Forms.FlowLayoutPanel();
this.m_lnkAssistant = new System.Windows.Forms.LinkLabel();
this.m_tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
this.m_buttonPanel = new System.Windows.Forms.FlowLayoutPanel();
((System.ComponentModel.ISupportInitialize)(this.m_tbLexicalForm)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.m_tbGloss)).BeginInit();
this.m_matchingEntriesGroupBox.SuspendLayout();
this.m_propsGroupBox.SuspendLayout();
this.m_glossGroupBox.SuspendLayout();
this.m_glossFlowLayout.SuspendLayout();
this.m_tableLayoutPanel.SuspendLayout();
this.m_buttonPanel.SuspendLayout();
this.SuspendLayout();
//
// m_btnOK
Expand Down Expand Up @@ -1241,6 +1262,8 @@ private void InitializeComponent()
resources.ApplyResources(this.m_propsGroupBox, "m_propsGroupBox");
this.m_propsGroupBox.Name = "m_propsGroupBox";
this.m_propsGroupBox.TabStop = false;
this.m_propsGroupBox.AutoSize = true;
this.m_propsGroupBox.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
//
// m_complexTypeLabel
//
Expand All @@ -1249,10 +1272,25 @@ private void InitializeComponent()
//
// m_glossGroupBox
//
this.m_glossGroupBox.Controls.Add(this.m_lnkAssistant);
this.m_glossGroupBox.Controls.Add(this.m_tbGloss);
//
// m_glossFlowLayout
//
this.m_glossFlowLayout.Dock = System.Windows.Forms.DockStyle.Top;
this.m_glossFlowLayout.AutoSize = true;
this.m_glossFlowLayout.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.m_glossFlowLayout.FlowDirection = System.Windows.Forms.FlowDirection.LeftToRight;
this.m_glossFlowLayout.WrapContents = false;
this.m_glossFlowLayout.Name = "m_glossFlowLayout";
this.m_glossFlowLayout.Padding = System.Windows.Forms.Padding.Empty;
this.m_glossFlowLayout.Margin = System.Windows.Forms.Padding.Empty;
this.m_glossFlowLayout.Controls.Add(this.m_tbGloss);
this.m_lnkAssistant.Margin = new System.Windows.Forms.Padding(3, 10, 3, 0);
this.m_glossFlowLayout.Controls.Add(this.m_lnkAssistant);
this.m_glossGroupBox.Controls.Add(this.m_glossFlowLayout);
resources.ApplyResources(this.m_glossGroupBox, "m_glossGroupBox");
this.m_glossGroupBox.Name = "m_glossGroupBox";
this.m_glossGroupBox.AutoSize = true;
this.m_glossGroupBox.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.m_glossGroupBox.TabStop = false;
//
// m_lnkAssistant
Expand All @@ -1263,18 +1301,48 @@ private void InitializeComponent()
this.m_lnkAssistant.VisitedLinkColor = System.Drawing.Color.Blue;
this.m_lnkAssistant.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkAssistant_LinkClicked);
//
// m_buttonPanel
//
this.m_buttonPanel.Dock = System.Windows.Forms.DockStyle.Top;
this.m_buttonPanel.AutoSize = true;
this.m_buttonPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.m_buttonPanel.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
this.m_buttonPanel.WrapContents = false;
this.m_buttonPanel.Name = "m_buttonPanel";
this.m_buttonPanel.Padding = new System.Windows.Forms.Padding(0, 3, 0, 6);
this.m_buttonPanel.Controls.Add(this.m_btnHelp);
this.m_buttonPanel.Controls.Add(this.m_btnCancel);
this.m_buttonPanel.Controls.Add(this.m_btnOK);
//
// m_tableLayoutPanel
//
this.m_tableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;
this.m_tableLayoutPanel.Padding = new System.Windows.Forms.Padding(5, 9, 5, 3);
this.m_tableLayoutPanel.Name = "m_tableLayoutPanel";
this.m_tableLayoutPanel.ColumnCount = 1;
this.m_tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.m_tableLayoutPanel.RowCount = 5;
this.m_tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.AutoSize));
this.m_tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.AutoSize));
this.m_tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.AutoSize));
this.m_tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.m_tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.AutoSize));
this.m_propsGroupBox.Dock = System.Windows.Forms.DockStyle.Top;
this.m_glossGroupBox.Dock = System.Windows.Forms.DockStyle.Top;
this.m_msaGroupBox.Dock = System.Windows.Forms.DockStyle.Top;
this.m_matchingEntriesGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
this.m_tableLayoutPanel.Controls.Add(this.m_propsGroupBox, 0, 0);
this.m_tableLayoutPanel.Controls.Add(this.m_glossGroupBox, 0, 1);
this.m_tableLayoutPanel.Controls.Add(this.m_msaGroupBox, 0, 2);
this.m_tableLayoutPanel.Controls.Add(this.m_matchingEntriesGroupBox, 0, 3);
this.m_tableLayoutPanel.Controls.Add(this.m_buttonPanel, 0, 4);
//
// InsertEntryDlg
//
this.AcceptButton = this.m_btnOK;
resources.ApplyResources(this, "$this");
this.CancelButton = this.m_btnCancel;
this.Controls.Add(this.m_glossGroupBox);
this.Controls.Add(this.m_propsGroupBox);
this.Controls.Add(this.m_msaGroupBox);
this.Controls.Add(this.m_matchingEntriesGroupBox);
this.Controls.Add(this.m_btnHelp);
this.Controls.Add(this.m_btnCancel);
this.Controls.Add(this.m_btnOK);
this.Controls.Add(this.m_tableLayoutPanel);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "InsertEntryDlg";
Expand All @@ -1287,8 +1355,14 @@ private void InitializeComponent()
this.m_matchingEntriesGroupBox.ResumeLayout(false);
this.m_matchingEntriesGroupBox.PerformLayout();
this.m_propsGroupBox.ResumeLayout(false);
this.m_glossFlowLayout.ResumeLayout(false);
this.m_glossFlowLayout.PerformLayout();
this.m_glossGroupBox.ResumeLayout(false);
this.m_glossGroupBox.PerformLayout();
this.m_buttonPanel.ResumeLayout(false);
this.m_buttonPanel.PerformLayout();
this.m_tableLayoutPanel.ResumeLayout(false);
this.m_tableLayoutPanel.PerformLayout();
this.ResumeLayout(false);

}
Expand Down
12 changes: 6 additions & 6 deletions Src/LexText/LexTextControls/InsertEntryDlg.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@
<value>6, 40</value>
</data>
<data name="m_tbLexicalForm.Size" type="System.Drawing.Size, System.Drawing">
<value>346, 23</value>
<value>356, 23</value>
</data>
<data name="m_tbLexicalForm.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
Expand All @@ -253,7 +253,7 @@
<value>6, 19</value>
</data>
<data name="m_tbGloss.Size" type="System.Drawing.Size, System.Drawing">
<value>346, 23</value>
<value>356, 23</value>
</data>
<data name="m_tbGloss.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
Expand Down Expand Up @@ -334,7 +334,7 @@
<value>13</value>
</data>
<data name="m_cbMorphType.Size" type="System.Drawing.Size, System.Drawing">
<value>170, 21</value>
<value>175, 21</value>
</data>
<data name="m_cbMorphType.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
Expand All @@ -352,13 +352,13 @@
<value>2</value>
</data>
<data name="m_cbComplexFormType.Location" type="System.Drawing.Point, System.Drawing">
<value>182, 92</value>
<value>187, 92</value>
</data>
<data name="m_cbComplexFormType.MaxDropDownItems" type="System.Int32, mscorlib">
<value>16</value>
</data>
<data name="m_cbComplexFormType.Size" type="System.Drawing.Size, System.Drawing">
<value>170, 21</value>
<value>175, 21</value>
</data>
<data name="m_cbComplexFormType.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
Expand Down Expand Up @@ -562,7 +562,7 @@
<value>NoControl</value>
</data>
<data name="m_complexTypeLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>174, 66</value>
<value>179, 66</value>
</data>
<data name="m_complexTypeLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>177, 23</value>
Expand Down
Loading
Loading