diff --git a/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.Designer.cs b/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.Designer.cs index 44b2b0db1..e4fc36fa2 100644 --- a/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.Designer.cs +++ b/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.Designer.cs @@ -42,7 +42,7 @@ private void InitializeComponent() this.cbUnderline = new System.Windows.Forms.CheckBox(); this.btnAlignmentHorizontal = new System.Windows.Forms.Button(); this.btnAlignmentVertical = new System.Windows.Forms.Button(); - this.btnClose = new System.Windows.Forms.Button(); + this.btnOK = new System.Windows.Forms.Button(); this.cmsAlignmentHorizontal = new System.Windows.Forms.ContextMenuStrip(this.components); this.tsmiAlignmentLeft = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiAlignmentCenter = new System.Windows.Forms.ToolStripMenuItem(); @@ -63,6 +63,7 @@ private void InitializeComponent() this.txtInput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtInput.Name = "txtInput"; this.txtInput.TextChanged += new System.EventHandler(this.txtInput_TextChanged); + this.txtInput.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtInput_KeyDown); // // btnTextColor // @@ -161,12 +162,12 @@ private void InitializeComponent() this.btnAlignmentVertical.UseVisualStyleBackColor = true; this.btnAlignmentVertical.Click += new System.EventHandler(this.btnAlignmentVertical_Click); // - // btnClose + // btnOK // - resources.ApplyResources(this.btnClose, "btnClose"); - this.btnClose.Name = "btnClose"; - this.btnClose.UseVisualStyleBackColor = true; - this.btnClose.Click += new System.EventHandler(this.btnClose_Click); + resources.ApplyResources(this.btnOK, "btnOK"); + this.btnOK.Name = "btnOK"; + this.btnOK.UseVisualStyleBackColor = true; + this.btnOK.Click += new System.EventHandler(this.btnClose_Click); // // cmsAlignmentHorizontal // @@ -232,7 +233,7 @@ private void InitializeComponent() // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.btnClose); + this.Controls.Add(this.btnOK); this.Controls.Add(this.flpProperties); this.Controls.Add(this.txtInput); this.MaximizeBox = false; @@ -258,7 +259,7 @@ private void InitializeComponent() private System.Windows.Forms.FlowLayoutPanel flpProperties; private System.Windows.Forms.Label lblTextSize; private System.Windows.Forms.NumericUpDown nudTextSize; - private System.Windows.Forms.Button btnClose; + private System.Windows.Forms.Button btnOK; private System.Windows.Forms.CheckBox cbBold; private System.Windows.Forms.CheckBox cbItalic; private System.Windows.Forms.CheckBox cbUnderline; diff --git a/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.cs b/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.cs index 3ca84b7c3..90dcb521d 100644 --- a/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.cs +++ b/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.cs @@ -163,6 +163,14 @@ private void tsmiAlignmentBottom_Click(object sender, EventArgs e) UpdateVerticalAlignmentImage(); } + private void txtInput_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyData == (Keys.Control | Keys.Enter)) + { + Close(); + } + } + private void txtInput_TextChanged(object sender, EventArgs e) { InputText = txtInput.Text; diff --git a/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.resx b/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.resx index 4da755627..5821acf8f 100644 --- a/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.resx +++ b/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.resx @@ -450,31 +450,31 @@ 3 - + Bottom, Right - + 422, 327 - + 104, 26 - + 3 - - Close + + OK - - btnClose + + btnOK - + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + 2