From e02b41f35388fd603a311407ba740791f42a8337 Mon Sep 17 00:00:00 2001 From: Manuel Kamper Date: Sat, 10 Aug 2019 10:54:02 +0200 Subject: [PATCH] improved cropper ui --- Mk0.Software.ImageSorter/Cropper.Designer.cs | 13 ++++++++----- Mk0.Software.ImageSorter/Cropper.cs | 6 ++++++ .../Mk0.Software.ImageSorter.csproj | 2 +- Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs | 2 +- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Mk0.Software.ImageSorter/Cropper.Designer.cs b/Mk0.Software.ImageSorter/Cropper.Designer.cs index 639e103..06d63ba 100644 --- a/Mk0.Software.ImageSorter/Cropper.Designer.cs +++ b/Mk0.Software.ImageSorter/Cropper.Designer.cs @@ -39,9 +39,9 @@ | System.Windows.Forms.AnchorStyles.Right))); this.rubberBand1.Disabled = false; this.rubberBand1.Image = null; - this.rubberBand1.Location = new System.Drawing.Point(12, 25); + this.rubberBand1.Location = new System.Drawing.Point(12, 38); this.rubberBand1.Name = "rubberBand1"; - this.rubberBand1.Size = new System.Drawing.Size(776, 527); + this.rubberBand1.Size = new System.Drawing.Size(760, 511); this.rubberBand1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.rubberBand1.TabIndex = 0; this.rubberBand1.ImageCropped += new System.EventHandler(this.RubberBand1_ImageCropped); @@ -51,8 +51,10 @@ this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.label1.Location = new System.Drawing.Point(12, 9); + this.label1.MaximumSize = new System.Drawing.Size(760, 28); + this.label1.MinimumSize = new System.Drawing.Size(760, 28); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(776, 13); + this.label1.Size = new System.Drawing.Size(760, 28); this.label1.TabIndex = 1; this.label1.Text = "Mit der Maus einen Rahmen ziehen. Dieser ist veränderbar. Doppelklick im Rahmen s" + "peichert den Zuschnitt. Klick außerhalb bricht den Zuschneide-Vorgang ab."; @@ -62,19 +64,20 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 564); + this.ClientSize = new System.Drawing.Size(784, 561); this.Controls.Add(this.label1); this.Controls.Add(this.rubberBand1); this.Cursor = System.Windows.Forms.Cursors.Default; this.MaximizeBox = false; this.MinimizeBox = false; - this.MinimumSize = new System.Drawing.Size(816, 603); + this.MinimumSize = new System.Drawing.Size(800, 600); this.Name = "Cropper"; this.ShowIcon = false; this.ShowInTaskbar = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Bild zuschneiden"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Cropper_FormClosing); + this.Resize += new System.EventHandler(this.Cropper_Resize); this.ResumeLayout(false); } diff --git a/Mk0.Software.ImageSorter/Cropper.cs b/Mk0.Software.ImageSorter/Cropper.cs index 76f16b3..9c56964 100644 --- a/Mk0.Software.ImageSorter/Cropper.cs +++ b/Mk0.Software.ImageSorter/Cropper.cs @@ -47,6 +47,12 @@ namespace Mk0.Software.ImageSorter Close(); } + private void Cropper_Resize(object sender, EventArgs e) + { + label1.MaximumSize = new Size(Width - 40, 28); + label1.Size = new Size(Width - 40, 28); + } + private void Cropper_FormClosing(object sender, FormClosingEventArgs e) { img.Dispose(); diff --git a/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj b/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj index f7e5959..a3ad4cb 100644 --- a/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj +++ b/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj @@ -33,7 +33,7 @@ manuelkamper.com false 0 - 1.37.0.0 + 1.38.0.0 true true true diff --git a/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs b/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs index d60ce7e..8aaa151 100644 --- a/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs +++ b/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.37.*")] +[assembly: AssemblyVersion("1.38.*")] //[assembly: AssemblyFileVersion("1.6.0.0")]