Merge branch 'release/0.1.2.016' into 'master'
Fixed: big icons for folders See merge request SympatheticFire/linear-app-launcher!16
This commit is contained in:
commit
a85699f751
@ -224,17 +224,21 @@ namespace AppLauncher.Windows.Forms
|
||||
{
|
||||
get
|
||||
{
|
||||
if (this.Parent == null)
|
||||
Control parentControl = this.Parent;
|
||||
while (true)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
if (parentControl == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
if (this.Parent.GetType() != typeof(FlowLayoutPanel))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
if (parentControl.GetType() == typeof(FlowLayoutPanel))
|
||||
{
|
||||
return parentControl as FlowLayoutPanel;
|
||||
}
|
||||
|
||||
return this.Parent as FlowLayoutPanel;
|
||||
parentControl = parentControl.Parent;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -242,23 +246,21 @@ namespace AppLauncher.Windows.Forms
|
||||
{
|
||||
get
|
||||
{
|
||||
FlowLayoutPanel layoutPanel = this.FlowLayoutPanel;
|
||||
if (layoutPanel == null)
|
||||
Control parentControl = this.FlowLayoutPanel;
|
||||
while (true)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
if (parentControl == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
if (layoutPanel.Parent == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
if (parentControl.GetType() == typeof(MainForm))
|
||||
{
|
||||
return parentControl as MainForm;
|
||||
}
|
||||
|
||||
if (layoutPanel.Parent.GetType() != typeof(MainForm))
|
||||
{
|
||||
return null;
|
||||
parentControl = parentControl.Parent;
|
||||
}
|
||||
|
||||
return layoutPanel.Parent as MainForm;
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user