mirror of
https://github.com/ShareX/ShareX.git
synced 2024-09-30 01:07:21 +13:00
Placement/Offset bug fix
This commit is contained in:
parent
e07152040b
commit
29ccf84a10
2 changed files with 9 additions and 4 deletions
|
@ -34,11 +34,16 @@ namespace ImageEffectsLib
|
||||||
public class WatermarkConfig
|
public class WatermarkConfig
|
||||||
{
|
{
|
||||||
public WatermarkType Type = WatermarkType.Text;
|
public WatermarkType Type = WatermarkType.Text;
|
||||||
|
public ContentAlignment Placement = ContentAlignment.BottomRight;
|
||||||
|
public int Offset = 5;
|
||||||
public DrawText Text = new DrawText();
|
public DrawText Text = new DrawText();
|
||||||
public DrawImage Image = new DrawImage();
|
public DrawImage Image = new DrawImage();
|
||||||
|
|
||||||
public Image Apply(Image img)
|
public Image Apply(Image img)
|
||||||
{
|
{
|
||||||
|
Text.Placement = Image.Placement = Placement;
|
||||||
|
Text.Offset = Image.Offset = new Point(Offset, Offset);
|
||||||
|
|
||||||
switch (Type)
|
switch (Type)
|
||||||
{
|
{
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -59,8 +59,8 @@ private void WatermarkUI_Load(object sender, EventArgs e)
|
||||||
chkWatermarkPosition.Items.AddRange(Enum.GetNames(typeof(ContentAlignment)));
|
chkWatermarkPosition.Items.AddRange(Enum.GetNames(typeof(ContentAlignment)));
|
||||||
}
|
}
|
||||||
|
|
||||||
chkWatermarkPosition.SelectedIndex = config.Text.Placement.GetIndex();
|
chkWatermarkPosition.SelectedIndex = config.Placement.GetIndex();
|
||||||
nudWatermarkOffset.Value = config.Text.Offset.X;
|
nudWatermarkOffset.Value = config.Offset;
|
||||||
cbWatermarkAutoHide.Checked = config.Text.AutoHide;
|
cbWatermarkAutoHide.Checked = config.Text.AutoHide;
|
||||||
|
|
||||||
txtWatermarkText.Text = config.Text.Text;
|
txtWatermarkText.Text = config.Text.Text;
|
||||||
|
@ -112,13 +112,13 @@ private void cboWatermarkType_SelectedIndexChanged(object sender, EventArgs e)
|
||||||
|
|
||||||
private void cbWatermarkPosition_SelectedIndexChanged(object sender, EventArgs e)
|
private void cbWatermarkPosition_SelectedIndexChanged(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
config.Text.Placement = Helpers.GetEnumFromIndex<ContentAlignment>(chkWatermarkPosition.SelectedIndex);
|
config.Placement = Helpers.GetEnumFromIndex<ContentAlignment>(chkWatermarkPosition.SelectedIndex);
|
||||||
UpdatePreview();
|
UpdatePreview();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void nudWatermarkOffset_ValueChanged(object sender, EventArgs e)
|
private void nudWatermarkOffset_ValueChanged(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
config.Text.Offset = new Point((int)nudWatermarkOffset.Value, (int)nudWatermarkOffset.Value);
|
config.Offset = (int)nudWatermarkOffset.Value;
|
||||||
UpdatePreview();
|
UpdatePreview();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue