1berry/MobiusMapEditor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make object tool < 4K friendly

Browse Source
This commit is contained in:
Rampastring 2020-09-12 12:06:09 +03:00
parent b1c2627a2f
commit 7fc43b95cc
4 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CnCTDRAMapEditor/App.config
View File

@ -35,6 +35,9 @@
<setting name="TemplateToolTextureSizeMultiplier" serializeAs="String">
<value>0.5</value>
</setting>
<setting name="ObjectToolItemSizeMultiplier" serializeAs="String">
<value>0.3</value>
</setting>
</MobiusEditor.Properties.Settings>
</userSettings>
<runtime>

24
CnCTDRAMapEditor/Controls/TypeComboBox.cs
View File

@ -57,7 +57,8 @@ namespace MobiusEditor.Controls
var typeItem = Items[e.Index] as TypeItem<IBrowsableType>;
if (typeItem?.Type != null)
{
e.ItemHeight = typeItem.Type.Thumbnail?.Height ?? MissingThumbnail.Height;
e.ItemHeight = (int)((typeItem.Type.Thumbnail?.Height ?? MissingThumbnail.Height) *
Properties.Settings.Default.ObjectToolItemSizeMultiplier);
}
}
@ -66,6 +67,7 @@ namespace MobiusEditor.Controls
base.OnDrawItem(e);
e.DrawBackground();
e.DrawFocusRectangle();
if ((e.Index >= 0) && (e.Index < Items.Count))
{
@ -84,15 +86,27 @@ namespace MobiusEditor.Controls
if ((e.State & DrawItemState.ComboBoxEdit) == DrawItemState.None)
{
var thumbnail = typeItem.Type.Thumbnail ?? MissingThumbnail;
var thumbnailWidth = (int)Math.Min(e.Bounds.Width - textSize.Width, thumbnail.Width);
var thumbnailSize = new Size(thumbnailWidth, thumbnailWidth * thumbnail.Height / thumbnail.Width);
var thumbnailWidth = (int)Math.Min((e.Bounds.Width - textSize.Width),
thumbnail.Width);
int thumbnailHeight = (int)Math.Min(e.Bounds.Height, thumbnail.Height);
double widthRatio = (e.Bounds.Width - textSize.Width) / (double)thumbnail.Width;
double heightRatio = e.Bounds.Height / (double)thumbnail.Height;
if (heightRatio < widthRatio)
{
thumbnailWidth = (int)(thumbnail.Width * heightRatio);
}
else
{
thumbnailHeight = (int)(thumbnail.Height * widthRatio);
}
var thumbnailSize = new Size(thumbnailWidth, thumbnailHeight);
var thumbnailBounds = new Rectangle(new Point(e.Bounds.Right - thumbnailSize.Width, e.Bounds.Top), thumbnailSize);
e.Graphics.DrawImage(thumbnail, thumbnailBounds);
}
}
}
e.DrawFocusRectangle();
}
}
}

12
CnCTDRAMapEditor/Properties/Settings.Designer.cs generated
View File

@ -91,5 +91,17 @@ namespace MobiusEditor.Properties {
this["TemplateToolTextureSizeMultiplier"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("0.3")]
public double ObjectToolItemSizeMultiplier {
get {
return ((double)(this["ObjectToolItemSizeMultiplier"]));
}
set {
this["ObjectToolItemSizeMultiplier"] = value;
}
}
}
}

3
CnCTDRAMapEditor/Properties/Settings.settings
View File

@ -20,5 +20,8 @@
<Setting Name="TemplateToolTextureSizeMultiplier" Type="System.Double" Scope="User">
<Value Profile="(Default)">0.5</Value>
</Setting>
<Setting Name="ObjectToolItemSizeMultiplier" Type="System.Double" Scope="User">
<Value Profile="(Default)">0.3</Value>
</Setting>
</Settings>
</SettingsFile>