github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-22 14:24:43 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Solved the issue with the destination picker font, and some other small issues.

Browse source 
There still is an issue when using Powertoys, that the capture is somehow skipping.
This commit is contained in:
Robin Krom 2020-10-13 17:19:54 +02:00
commit 5825d5cfd6
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Greenshot/Forms/AboutForm.Designer.cs generated
View file

@ -67,7 +67,7 @@ namespace Greenshot.Forms {
// //
// lblTitle // lblTitle
// //
this.lblTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.World, ((byte)(0))); this.lblTitle.Font = new System.Drawing.Font(System.Drawing.FontFamily.GenericSansSerif, 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblTitle.Location = new System.Drawing.Point(108, 12); this.lblTitle.Location = new System.Drawing.Point(108, 12);
this.lblTitle.Name = "lblTitle"; this.lblTitle.Name = "lblTitle";
this.lblTitle.Size = new System.Drawing.Size(263, 19); this.lblTitle.Size = new System.Drawing.Size(263, 19);

4
Greenshot/Forms/CaptureForm.Designer.cs generated
View file

@ -55,8 +55,8 @@ namespace Greenshot.Forms {
// //
// CaptureForm // CaptureForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(0, 0); this.ClientSize = new System.Drawing.Size(0, 0);
this.Cursor = System.Windows.Forms.Cursors.Cross; this.Cursor = System.Windows.Forms.Cursors.Cross;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;

10
Greenshot/Forms/ImageEditorForm.Designer.cs generated
View file

@ -231,8 +231,8 @@ namespace Greenshot {
// //
// topToolStripContainer // topToolStripContainer
// //
this.topToolStripContainer.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.topToolStripContainer.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.topToolStripContainer.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.topToolStripContainer.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
// //
// topToolStripContainer.BottomToolStripPanel // topToolStripContainer.BottomToolStripPanel
// //
@ -1037,7 +1037,6 @@ namespace Greenshot {
// //
// propertiesToolStrip // propertiesToolStrip
// //
this.propertiesToolStrip.AutoSize = false;
this.propertiesToolStrip.ClickThrough = true; this.propertiesToolStrip.ClickThrough = true;
this.propertiesToolStrip.ImageScalingSize = coreConfiguration.ScaledIconSize; this.propertiesToolStrip.ImageScalingSize = coreConfiguration.ScaledIconSize;
this.propertiesToolStrip.Dock = System.Windows.Forms.DockStyle.Fill; this.propertiesToolStrip.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1225,7 +1224,6 @@ namespace Greenshot {
// fontFamilyComboBox // fontFamilyComboBox
// //
this.fontFamilyComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.fontFamilyComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.fontFamilyComboBox.AutoSize = false;
this.fontFamilyComboBox.MaxDropDownItems = 20; this.fontFamilyComboBox.MaxDropDownItems = 20;
this.fontFamilyComboBox.Name = "fontFamilyComboBox"; this.fontFamilyComboBox.Name = "fontFamilyComboBox";
this.fontFamilyComboBox.Size = new System.Drawing.Size(200, 20); this.fontFamilyComboBox.Size = new System.Drawing.Size(200, 20);
@ -1815,8 +1813,8 @@ namespace Greenshot {
// //
// ImageEditorForm // ImageEditorForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(785, 485); this.ClientSize = new System.Drawing.Size(785, 485);
this.Controls.Add(this.topToolStripContainer); this.Controls.Add(this.topToolStripContainer);
this.KeyPreview = true; this.KeyPreview = true;

6
GreenshotPlugin/Core/AbstractDestination.cs
View file

@ -161,8 +161,10 @@ namespace GreenshotPlugin.Core {
var screenDpi = DpiHelper.GetDpi(menu.Location); var screenDpi = DpiHelper.GetDpi(menu.Location);
var scaledIconSize = DpiHelper.ScaleWithDpi(CoreConfig.IconSize, screenDpi); var scaledIconSize = DpiHelper.ScaleWithDpi(CoreConfig.IconSize, screenDpi);
menu.SuspendLayout(); menu.SuspendLayout();
menu.ImageScalingSize = scaledIconSize; var fontSize = DpiHelper.ScaleWithDpi(12f, screenDpi);
menu.ResumeLayout(); menu.Font = new Font(FontFamily.GenericSansSerif, fontSize, FontStyle.Regular, GraphicsUnit.Pixel);
menu.ImageScalingSize = scaledIconSize;
menu.ResumeLayout();
}; };
menu.Closing += delegate(object source, ToolStripDropDownClosingEventArgs eventArgs) { menu.Closing += delegate(object source, ToolStripDropDownClosingEventArgs eventArgs) {