Merge branch 'develop' into beta
This commit is contained in:
@@ -12,7 +12,7 @@ using System.Runtime.InteropServices;
|
|||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyCulture("")]
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
[assembly: Guid("04f08f8d-9e98-423b-acdb-4effb31c0d35")]
|
[assembly: Guid("04f08f8d-9e98-423b-acdb-4effb31c0d35")]
|
||||||
[assembly: AssemblyVersion("4.1.0.6")]
|
[assembly: AssemblyVersion("5.0.0.0")]
|
||||||
[assembly: AssemblyFileVersion("4.1.0.6")]
|
[assembly: AssemblyFileVersion("5.0.0.0")]
|
||||||
|
|
||||||
[assembly: CLSCompliant(false)]
|
[assembly: CLSCompliant(false)]
|
@@ -13,7 +13,11 @@ namespace EveOPreview.Services.Implementation
|
|||||||
|
|
||||||
public WindowManager()
|
public WindowManager()
|
||||||
{
|
{
|
||||||
this.IsCompositionEnabled = DwmNativeMethods.DwmIsCompositionEnabled();
|
// Composition is always enabled for Windows 8+
|
||||||
|
this.IsCompositionEnabled =
|
||||||
|
((Environment.OSVersion.Version.Major == 6) && (Environment.OSVersion.Version.Minor >= 2)) // Win 8 and Win 8.1
|
||||||
|
|| (Environment.OSVersion.Version.Major >= 10) // Win 10
|
||||||
|
|| DwmNativeMethods.DwmIsCompositionEnabled(); // In case of Win 7 an API call is requiredWin 7
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool IsCompositionEnabled { get; }
|
public bool IsCompositionEnabled { get; }
|
||||||
|
@@ -820,7 +820,7 @@ namespace EveOPreview.View
|
|||||||
DocumentationLinkLabel.Padding = new System.Windows.Forms.Padding(12, 5, 12, 5);
|
DocumentationLinkLabel.Padding = new System.Windows.Forms.Padding(12, 5, 12, 5);
|
||||||
DocumentationLinkLabel.Size = new System.Drawing.Size(336, 30);
|
DocumentationLinkLabel.Size = new System.Drawing.Size(336, 30);
|
||||||
DocumentationLinkLabel.TabIndex = 6;
|
DocumentationLinkLabel.TabIndex = 6;
|
||||||
DocumentationLinkLabel.Text = "For more information visit our forum thread:";
|
DocumentationLinkLabel.Text = "For more information visit the forum thread:";
|
||||||
//
|
//
|
||||||
// DescriptionLabel
|
// DescriptionLabel
|
||||||
//
|
//
|
||||||
|
@@ -128,7 +128,6 @@ The following hotkey is described as `modifier+key` where `modifier` can be **Co
|
|||||||
## Compatibility Mode
|
## Compatibility Mode
|
||||||
|
|
||||||
This setting allows to enable an alternate thumbnail render. This render doesn't use advanced DWM API to create live previews. Instead it is a screenshot-based render with the following pros and cons:
|
This setting allows to enable an alternate thumbnail render. This render doesn't use advanced DWM API to create live previews. Instead it is a screenshot-based render with the following pros and cons:
|
||||||
* `+` Doesn't require Aero to work
|
|
||||||
* `+` Should work even in remote desktop environments
|
* `+` Should work even in remote desktop environments
|
||||||
* `-` Consumes significantly more memory. In the testing environment EVE-O Preview did consume around 180 MB to manage 3 thumbnails using this render. At the same time the primary render did consume around 50 MB when run in the same environment.
|
* `-` Consumes significantly more memory. In the testing environment EVE-O Preview did consume around 180 MB to manage 3 thumbnails using this render. At the same time the primary render did consume around 50 MB when run in the same environment.
|
||||||
* `-` Thumbnail images are refreshed at 1 FPS rate
|
* `-` Thumbnail images are refreshed at 1 FPS rate
|
||||||
|
Reference in New Issue
Block a user