Skip to content

Commit f93ffe5

Browse files
zsd4yrRussKie
authored andcommitted
Port ContentAlignmentEditor
Closes #2018
1 parent e0d025c commit f93ffe5

File tree

20 files changed

+1350
-0
lines changed

20 files changed

+1350
-0
lines changed

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
* text=auto
2+
3+
# Collapse XLF files in PRs by default
4+
*.xlf linguist-generated=true

src/System.Windows.Forms.Design.Editors/src/Misc/DpiHelper.cs

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,15 @@ public static bool IsScalingRequired
126126
}
127127
}
128128

129+
/// <summary>
130+
/// scale logical pixel to the factor
131+
/// </summary>
132+
public static int ConvertToGivenDpiPixel(int value, double pixelFactor)
133+
{
134+
var scaledValue = (int)Math.Round(value * pixelFactor);
135+
return scaledValue == 0 ? 1 : scaledValue;
136+
}
137+
129138
/// <summary>
130139
/// Transforms a horizontal or vertical integer coordinate from logical to device units
131140
/// by scaling it up for current DPI and rounding to nearest integer value
@@ -142,6 +151,20 @@ public static int LogicalToDeviceUnits(int value, int devicePixels = 0)
142151
return (int)Math.Round(scalingFactor * (double)value);
143152
}
144153

154+
/// <summary>
155+
/// Transforms a horizontal or vertical integer coordinate from logical to device units
156+
/// by scaling it up for current DPI and rounding to nearest integer value
157+
/// </summary>
158+
public static double LogicalToDeviceUnits(double value, int devicePixels = 0)
159+
{
160+
if (devicePixels == 0)
161+
{
162+
return LogicalToDeviceUnitsScalingFactor * value;
163+
}
164+
double scalingFactor = devicePixels / LogicalDpi;
165+
return scalingFactor * value;
166+
}
167+
145168
/// <summary>
146169
/// Transforms a horizontal integer coordinate from logical to device units
147170
/// by scaling it up for current DPI and rounding to nearest integer value

src/System.Windows.Forms.Design.Editors/src/Resources/SR.resx

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,36 @@ Press Ctrl+Enter to accept Text.</value>
218218
<data name="ImageCollectionEditorFormText" xml:space="preserve">
219219
<value>Images Collection Editor</value>
220220
</data>
221+
<data name="ContentAlignmentEditorAccName" xml:space="preserve">
222+
<value>Alignment Picker</value>
223+
</data>
224+
<data name="ContentAlignmentEditorBottomCenterAccName" xml:space="preserve">
225+
<value>Bottom Middle</value>
226+
</data>
227+
<data name="ContentAlignmentEditorBottomLeftAccName" xml:space="preserve">
228+
<value>Bottom Left</value>
229+
</data>
230+
<data name="ContentAlignmentEditorBottomRightAccName" xml:space="preserve">
231+
<value>Bottom Right</value>
232+
</data>
233+
<data name="ContentAlignmentEditorMiddleCenterAccName" xml:space="preserve">
234+
<value>Middle Center</value>
235+
</data>
236+
<data name="ContentAlignmentEditorMiddleLeftAccName" xml:space="preserve">
237+
<value>Middle Left</value>
238+
</data>
239+
<data name="ContentAlignmentEditorMiddleRightAccName" xml:space="preserve">
240+
<value>Middle Right</value>
241+
</data>
242+
<data name="ContentAlignmentEditorTopCenterAccName" xml:space="preserve">
243+
<value>Top Center</value>
244+
</data>
245+
<data name="ContentAlignmentEditorTopLeftAccName" xml:space="preserve">
246+
<value>Top Left</value>
247+
</data>
248+
<data name="ContentAlignmentEditorTopRightAccName" xml:space="preserve">
249+
<value>Top Right</value>
250+
</data>
221251
<data name="iconFileDescription" xml:space="preserve">
222252
<value>Icon files</value>
223253
</data>

src/System.Windows.Forms.Design.Editors/src/Resources/xlf/SR.cs.xlf

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

src/System.Windows.Forms.Design.Editors/src/Resources/xlf/SR.de.xlf

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

src/System.Windows.Forms.Design.Editors/src/Resources/xlf/SR.es.xlf

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

src/System.Windows.Forms.Design.Editors/src/Resources/xlf/SR.fr.xlf

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

src/System.Windows.Forms.Design.Editors/src/Resources/xlf/SR.it.xlf

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

0 commit comments

Comments
 (0)