Skip to content

Commit 24ece0f

Browse files
pandinocoderpandinocoder
authored
fix: make event and animation editors fit 720p displays (AscensionGameDev#2085)
* fix: resize event editor window * fix: make animation editor fit 1280x720 displays
1 parent 6cdaabf commit 24ece0f

16 files changed

+1881
-1507
lines changed

‎Intersect.Editor/Forms/Controls/LightEditorCtrl.Designer.cs‎

Lines changed: 241 additions & 225 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Intersect.Editor/Forms/Controls/LightEditorCtrl.cs‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Windows.Forms;
33

44
using Intersect.Editor.Core;
@@ -20,6 +20,8 @@ public partial class LightEditorCtrl : UserControl
2020

2121
private LightBase mEditingLight;
2222

23+
private ToolTip _tooltip = new ToolTip();
24+
2325
public LightEditorCtrl()
2426
{
2527
InitializeComponent();
@@ -56,12 +58,12 @@ private void InitLocalization()
5658
lblOffsetX.Text = Strings.LightEditor.xoffset;
5759
lblOffsetY.Text = Strings.LightEditor.yoffset;
5860
lblColor.Text = Strings.LightEditor.color;
59-
btnSelectLightColor.Text = Strings.LightEditor.selectcolor;
6061
lblIntensity.Text = Strings.LightEditor.intensity;
6162
lblSize.Text = Strings.LightEditor.size;
6263
lblExpandAmt.Text = Strings.LightEditor.expandamt;
63-
btnOkay.Text = Strings.LightEditor.save;
64-
btnCancel.Text = Strings.LightEditor.revert;
64+
_tooltip.SetToolTip(btnCancel, Strings.LightEditor.revert);
65+
_tooltip.SetToolTip(btnOkay, Strings.LightEditor.save);
66+
_tooltip.SetToolTip(btnSelectLightColor, Strings.LightEditor.SelectColor);
6567
}
6668

6769
//Lights Tab
@@ -86,6 +88,7 @@ private void btnLightEditorRevert_Click(object sender, EventArgs e)
8688
mEditingLight.Size = mBackupLight.Size;
8789
mEditingLight.OffsetX = mBackupLight.OffsetX;
8890
mEditingLight.OffsetY = mBackupLight.OffsetY;
91+
LoadEditor(mEditingLight);
8992
if (mEditingLight == Globals.EditingLight)
9093
{
9194
Globals.EditingLight = null;

‎Intersect.Editor/Forms/Controls/LightEditorCtrl.resx‎

Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<metadata name="imglstLightEditor.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121+
<value>17, 17</value>
122+
</metadata>
123+
<data name="imglstLightEditor.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
124+
<value>
125+
AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs
126+
LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu
127+
SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAUAIAAAJNU0Z0AUkBTAIBAQMB
128+
AAEwAQABMAEAARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMAARADAAEBAQABIAYAARD/
129+
AP8AHAAQ/wN0AX8sADD/kAAI/wMyAToDCgEMBP8DdAF/KAAU/wwAEP+QAAj/CAADCgEMBP8DdAF/JAAQ
130+
/wM/AUgMABD/lAAI/wgAAwoBDAT/A3QBfyAAEP8DhwGTDAAQ/xAAFP8YAAMNARAE/1QACP8IAAMKAQwE
131+
/wN0AX8cABT/CAADCgEMEP8QABD/HAAI/1gACP8IAAMKAQwE/wOPAZoE/xQAMP8QAAz/A7gBwBgACP9g
132+
AAj/CAAI/wMtATQUADD/EAAU/wPqAe4DEQEUA0wBVgz/AwYBB2QAGP8UADD/EAAE/wgAAx8BJBj/cAAY
133+
/xAACP8YABD/pAADLQE0BP8DPQFGEP8DvAHEDAAI/xgAEP+oAAMvATYIAAj/A7wBxBAALP+8AAO8AcQU
134+
ACj//wD/AJIAAUIBTQE+BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcAA/8BAAb/AgAG/wIAAcEB
135+
/wHAAQMC/wIAAcAB/wHBAcMC/wIAAcwBfwHBAcMC/wIAAeYBPwHBAcMBwQH5AgAB8wEfAcEBgwHDAfkC
136+
AAH5AYcBwAEDAcMB8wIAAfwBxwHAAQMBwAEDAgAB/gEHAcABAwHYAQ8CAAH/AQMBzwHDAv8CAAH+AQEB
137+
zwHDAv8CAAH/AWMBwAEHAv8CAAH/AfcBwAEPAv8CAAb/AgAG/wIACw==
138+
</value>
139+
</data>
140+
<metadata name="colorDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
141+
<value>162, 17</value>
142+
</metadata>
143+
</root>

0 commit comments

Comments
 (0)