Merge pull request #66 from beyluta/development

Feat: Widget Drop Shadow & InnoSetup Script

Author: beyluta

Assets/index.html

@@ -230,6 +230,10 @@ <h3>&#8226; Append the meta tags for the widget window</h3>
                 &lt;meta name="windowOpacity" content="255"&gt;
               </div>
 
+              <div class="code">
+                &lt;meta name="windowDropShadow" content="true"&gt;
+              </div>
+
               <div class="code">
                 &lt;meta name="topMost" content="true"&gt;
               </div>

Components/Widget.Component.cs

@@ -75,26 +75,22 @@ public override void AppendWidget(Form window, string path)
 
                 double scale = Int32.Parse((string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\ThemeManager", "LastLoadedDPI", "96")) / 96.0;
 
-                string sizeString = this.htmlDocService.GetMetaTagValue("windowSize", htmlPath);
-                string radiusString = this.htmlDocService.GetMetaTagValue("windowBorderRadius", htmlPath);
-                string locationString = this.htmlDocService.GetMetaTagValue("windowLocation", htmlPath);
-                string topMostString = this.htmlDocService.GetMetaTagValue("topMost", htmlPath);
-                string opacityString = this.htmlDocService.GetMetaTagValue("windowOpacity", htmlPath);
-                int roundess = radiusString != null ? (int)(int.Parse(radiusString) * scale) : 0;
-                this.width = sizeString != null ? (int)(int.Parse(sizeString.Split(' ')[0]) * scale) : (int)(width * scale);
-                this.height = sizeString != null ? (int)(int.Parse(sizeString.Split(' ')[1]) * scale) : (int)(height * scale);
-                int locationX = locationString != null ? int.Parse(locationString.Split(' ')[0]) : mousePos.X;
-                int locationY = locationString != null ? int.Parse(locationString.Split(' ')[1]) : mousePos.Y;
-                byte opacity = (byte)(opacityString != null ? byte.Parse(opacityString.Split(' ')[0]) : 255);
-                bool topMost = topMostString != null ? bool.Parse(topMostString.Split(' ')[0]) : false;
+                WidgetHtmlTags tags = GetWidgetHtmlTags(htmlPath);
+                int roundess = tags.Radius != null ? (int)(int.Parse(tags.Radius) * scale) : 0;
+                this.width = tags.Size != null ? (int)(int.Parse(tags.Size.Split(' ')[0]) * scale) : (int)(width * scale);
+                this.height = tags.Size != null ? (int)(int.Parse(tags.Size.Split(' ')[1]) * scale) : (int)(height * scale);
+                int locationX = tags.Location != null ? int.Parse(tags.Location.Split(' ')[0]) : mousePos.X;
+                int locationY = tags.Location != null ? int.Parse(tags.Location.Split(' ')[1]) : mousePos.Y;
+                byte opacity = (byte)(tags.Opacity != null ? byte.Parse(tags.Opacity.Split(' ')[0]) : 255);
+                bool dropShadow = tags.DropShadow != null ? bool.Parse(tags.DropShadow.Split(' ')[0]) : false;
+                bool topMost = tags.TopMost != null ? bool.Parse(tags.TopMost.Split(' ')[0]) : false;
                 topMost = alwaysOnTop.HasValue ? (bool)alwaysOnTop : topMost;
 
-                window = new WidgetForm();
+                window = new WidgetForm(dropShadow);
                 window.Size = new Size(this.width, this.height);
                 window.StartPosition = FormStartPosition.Manual;
-                window.Location = locationString == null ? new Point(position.X, position.Y) : new Point(locationX, locationY);
+                window.Location = tags.Location == null ? new Point(position.X, position.Y) : new Point(locationX, locationY);
                 window.Text = title;
-                // window.TopMost = topMost; delayed, because it causes a FormActivate event to be dispatched prematurely
                 window.FormBorderStyle = FormBorderStyle.None;
                 window.ShowInTaskbar = false;
                 window.Region = System.Drawing.Region.FromHrgn(CreateRoundRectRgn(0, 0, this.width, this.height, roundess, roundess)); // Border radius
@@ -117,6 +113,19 @@ public override void AppendWidget(Form window, string path)
             }).Start();
         }
 
+        private WidgetHtmlTags GetWidgetHtmlTags(string htmlPath)
+        {
+            return new WidgetHtmlTags
+            {
+                Size = this.htmlDocService.GetMetaTagValue("windowSize", htmlPath),
+                Radius = this.htmlDocService.GetMetaTagValue("windowBorderRadius", htmlPath),
+                Location = this.htmlDocService.GetMetaTagValue("windowLocation", htmlPath),
+                TopMost = this.htmlDocService.GetMetaTagValue("topMost", htmlPath),
+                Opacity = this.htmlDocService.GetMetaTagValue("windowOpacity", htmlPath),
+                DropShadow = this.htmlDocService.GetMetaTagValue("windowDropShadow", htmlPath)
+            };
+        }
+
         private void OnBrowserInitialized(object sender, EventArgs e)
         {
             this.timerService.CreateTimer(1, OnBrowserUpdateTick, true, true);

Models/Configuration.Model.cs

@@ -18,6 +18,16 @@ internal struct WidgetConfiguration
         public bool alwaysOnTop { get; set; }
     }
 
+    internal struct WidgetHtmlTags
+    {
+        public string Size { get; set; }
+        public string Radius { get; set; }
+        public string Location { get; set; }
+        public string TopMost { get; set; }
+        public string Opacity { get; set; }
+        public string DropShadow { get; set; }
+    }
+
     internal struct Configuration
     {
         /// <summary>

Modules/WidgetForm.Module.cs

@@ -6,15 +6,29 @@ namespace Modules
 {
     internal class WidgetForm : Form
     {
-        private bool isWidget;
+        private readonly bool isWidget;
+        private readonly bool enableDropShadow;
 
         /// <summary>
         /// Constructs a new instance of the WidgetForm class
         /// </summary>
         /// <param name="isWidget">Is the form a widget</param>
-        public WidgetForm(bool isWidget = true) : base()
+        public WidgetForm(bool enableDropShadow = false, bool isWidget = true) : base()
         {
             this.isWidget = isWidget;
+            this.enableDropShadow = enableDropShadow;
+        }
+
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                const int CS_DROPSHADOW = 0x20000;
+                CreateParams cp = base.CreateParams;
+                if (enableDropShadow)
+                cp.ClassStyle |= CS_DROPSHADOW;
+                return cp;
+            }
         }
 
         protected override void OnFormClosing(FormClosingEventArgs e)

README.md

@@ -2,7 +2,7 @@
 
 <p align="center">
   <a href="https://github.com/beyluta/WinWidgets">
-    <img src="https://img.shields.io/badge/Version-1.4.0-green" alt="WinWidgets version" />
+    <img src="https://img.shields.io/badge/Version-1.5.0-green" alt="WinWidgets version" />
   </a>
 </p>
 
@@ -31,7 +31,7 @@
 
 ## About The Project
 
-WinWidgets offers the possibility to create desktop widgets using HTML, CSS, and JavaScript for your Windows 10 or Windows 11 machine.
+**WinWidgets** makes web-based desktop widgets easy to develop. Using `HTML`, `CSS`, and `JavaScript` create your own Windows 11 widgets on the fly.
 
 This is what makes this project interesting:
 
@@ -40,10 +40,19 @@ This is what makes this project interesting:
 - 🖱️ Develop your widgets from anywhere then simply drag and drop to easily port it over
 - ⌨️ Have better control over your widget's window with built-in front-end tags
 
-## Download
-You can find the latest version of WinWidgets on the [release page](https://github.com/beyluta/WinWidgets/releases) of the official GitHub repository.
+<!-- GETTING STARTED -->
+
+## Prerequisites
+*As of `>= v1.5.0` all dependencies are automatically installed through the official installer.*
 
-<i>Versions of WinWidgets < v1.3.0 requires Visual Studio and some .NET packages to be preinstalled. Newer versions of the Software (>= 1.3.0) do not have this dependency.</i>
+List of dependencies required for `< v1.5.0`. Make sure all of these are installed:
+
+- .NET Framework 4.7.2
+- [Microsoft Visual C++ 2015-2019](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170#visual-studio-2015-2017-2019-and-2022)
+
+
+## Download
+Download the latest version of WinWidgets through the [release page](https://github.com/beyluta/WinWidgets/releases) of this repository.
 
 ## Screenshots and usage
 
@@ -56,14 +65,17 @@ You can find the latest version of WinWidgets on the [release page](https://gith
 #### Develop your own widgets easily. Find out more by navigating to the development panel
    <br><img src="Assets/Images/dev-widget.gif">
 
-<!-- GETTING STARTED -->
+<!-- Development -->
 
-## Prerequisites
+## Development
 
-List of software required. Make sure all of these are installed.
+Simply fork or clone the project then open the solution file. Go ahead and build then run the Software.
+If you want to make your own installers for distribution: There is a script called `SETUP.iss` to help package the Software as an installer.
 
-- .NET Framework 4.7.2
-- [Microsoft Visual C++ 2015-2019](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170#visual-studio-2015-2017-2019-and-2022)
+- Visual Studio Community 2022 (or equivalent)
+- InnoSetup (Optional - for generating the installer)
+
+*Note: I will not accept installer files. Make your PRs and I will personally compile it for distribution.*
 
 <!-- CONTRIBUTING -->
 
@@ -76,20 +88,6 @@ List of software required. Make sure all of these are installed.
 5. Add yourself to the CONTRIBUTORS.txt file
 6. Open a Pull Request
 
-<!-- LICENSE -->
-
-## License
-
-Distributed under the MIT License. See `LICENSE.txt` for more information.
-
-<!-- CONTACT -->
-
-## Contact
-
-📎 Pedro Ribeiro - <a href="https://pedroribeiro.site">Portfolio</a>
-<br>
-📫 Email: [email protected]
-
 <!-- ACKNOWLEDGMENTS -->
 
 ## Acknowledgments
@@ -102,3 +100,4 @@ Many thanks to these projects for their super useful resources 😄
 - [Chromium](https://www.chromium.org/)
 - [CefSharp](https://cefsharp.github.io/)
 - [Json.NET](https://www.newtonsoft.com/json)
+- [Narod's FullscreenDetector](https://github.com/NarodGaming/gamedetector)

SETUP.iss

@@ -0,0 +1,51 @@
+#define MyAppName "WinWidgets"
+#define MyAppVersion "1.5.0"
+#define MyAppPublisher "Beyluta"
+#define MyAppURL "https://github.com/beyluta/WinWidgets"
+#define MyAppExeName "WidgetsDotNet.exe"
+
+#define MyAppPath ".\bin\x64\Release"
+#define MyAppOutDir GetEnv("USERPROFILE") + "\\Downloads"
+#define MyRedistPath MyAppPath + "\VC_redist.x64.exe"
+
+[Setup]
+AppId={{F8F9EED5-BFA1-4ACD-89D8-2639A711905F}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={autopf}\{#MyAppName}
+UninstallDisplayIcon={app}\{#MyAppExeName}
+ArchitecturesAllowed=x64compatible
+ArchitecturesInstallIn64BitMode=x64compatible
+DefaultGroupName={#MyAppName}
+DisableProgramGroupPage=yes
+PrivilegesRequiredOverridesAllowed=dialog
+OutputDir={#MyAppOutDir}
+OutputBaseFilename=WinWidgets_Installer
+SetupIconFile={#MyAppPath}\Assets\favicon.ico
+SolidCompression=yes
+WizardStyle=modern
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "{#MyAppPath}\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#MyAppPath}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#MyRedistPath}"; DestDir: {tmp}
+
+[Icons]
+Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{tmp}\VC_redist.x64.exe"; Parameters: "/quiet /norestart"; \
+    Flags: waituntilterminated; \
+    StatusMsg: "Installing VC++ 2015-2022 Redistributable..."
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent

Services/Asset.Service.cs

@@ -37,7 +37,7 @@ static class AssetService
         /// <summary>
         /// Semantic version of the application
         /// </summary>
-        static private string version = "1.3.2";
+        static private string version = "1.5.0";
 
         /// <summary>
         /// Gets the path where the HTML files (widgets) of the project are stored