OSD AoT library

.github/workflows/build.yml

@@ -6,6 +6,9 @@ on:
   pull_request:
     branches: [ master ]
 
+env:
+  MSBuild_Path: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\MSBuild.exe
+
 jobs:
   build:
 
@@ -14,14 +17,11 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v3
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: 8.0.x
-    - name: Restore
-      run: dotnet restore
+    - name: Clean up
+      run: |
+        & "${{env.MSBuild_Path}}" ${{github.workspace}}\LenovoLegionToolkit.sln /t:Clean /p:Configuration=Release
     - name: Build
-      run: .\make.bat
+      run: .\make.bat "${{env.MSBuild_Path}}"
     - name: Upload artifact
       uses: actions/upload-artifact@v3
       with:

.github/workflows/release.yml

@@ -5,6 +5,9 @@ on:
     tags:
       - "[0-9]*.[0-9]*.[0-9]*"
 
+env:
+  MSBuild_Path: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\MSBuild.exe
+
 jobs:
   build:
 
@@ -13,14 +16,11 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v3
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: 8.0.x
-    - name: Restore
-      run: dotnet restore
+    - name: Clean up
+      run: |
+        & "${{env.MSBuild_Path}}" ${{github.workspace}}\LenovoLegionToolkit.sln /t:Clean /p:Configuration=Release
     - name: Build
-      run: .\make.bat ${{ github.ref_name }}
+      run: .\make.bat "${{env.MSBuild_Path}}" ${{github.ref_name}}
     - name: Release
       uses: softprops/[email protected]
       with:

LenovoLegionToolkit.Lib.AoTOSD/Animation/BasicAnimation.cpp

@@ -0,0 +1,6 @@
+#include"BasicAnimation.h"
+
+namespace Animation = LenovoLegionToolkit::Lib::AoTOSD::Animation;
+
+Animation::BasicAnimation::BasicAnimation(int speed) :
+    _speed(speed) {};

LenovoLegionToolkit.Lib.AoTOSD/Animation/BasicAnimation.h

@@ -0,0 +1,23 @@
+#pragma once
+
+namespace LenovoLegionToolkit::Lib::AoTOSD::Window { class OSDWindow; }
+
+namespace LenovoLegionToolkit::Lib::AoTOSD::Animation {
+
+    class BasicAnimation {
+
+    public:
+        BasicAnimation(int speed);
+        virtual ~BasicAnimation() {};
+
+        virtual bool Animate(Window::OSDWindow* window) = 0;
+        virtual void Reset(Window::OSDWindow* window) = 0;
+
+        virtual int GetUpdateInterval() = 0;
+
+    protected:
+        int _speed;
+
+    }; // class BasicAnimation
+
+} // namespace LenovoLegionToolkit::Lib::AoTOSD::Animation

LenovoLegionToolkit.Lib.AoTOSD/Animation/FadeOutAnimation.cpp

@@ -0,0 +1,45 @@
+#include"FadeOutAnimation.h"
+#include"../Window/OSDWindow.h"
+
+namespace Animation = LenovoLegionToolkit::Lib::AoTOSD::Animation;
+
+Animation::FadeOutAnimation::FadeOutAnimation(int speed) :
+    BasicAnimation(speed)
+{
+    int bestInaccuracy = 255;
+    int bestInterval = 10;
+    for (int i = 10; i <= 20; i++)
+    {
+        int si = this->_speed / i;
+        int inaccuracy = 255 - 255 / si * si;
+        if (inaccuracy < bestInaccuracy)
+        {
+            bestInaccuracy = inaccuracy;
+            bestInterval = i;
+        }
+    }
+    this->_interval = bestInterval;
+    this->_step = 255 / (this->_speed / this->_interval);
+    return;
+}
+
+bool Animation::FadeOutAnimation::Animate(Window::OSDWindow* window) {
+    byte current = window->GetTransparency();
+    int newTrans = current - this->_step;
+    if (newTrans < 0)
+    {
+        newTrans = 0;
+        return true;
+    }
+    window->SetTransparency(newTrans);
+    return false;
+}
+
+void Animation::FadeOutAnimation::Reset(Window::OSDWindow* window) {
+    window->SetTransparency(255);
+    return;
+}
+
+int Animation::FadeOutAnimation::GetUpdateInterval() {
+    return this->_interval;
+}

LenovoLegionToolkit.Lib.AoTOSD/Animation/FadeOutAnimation.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include"BasicAnimation.h"
+
+namespace LenovoLegionToolkit::Lib::AoTOSD::Animation {
+
+    class FadeOutAnimation final : public BasicAnimation {
+
+    public:
+        FadeOutAnimation(int speed);
+        ~FadeOutAnimation() {};
+
+        bool Animate(Window::OSDWindow* window) override;
+        void Reset(Window::OSDWindow* window) override;
+
+        int GetUpdateInterval() override;
+
+    private:
+        int _interval;
+        int _step;
+
+    }; // class FadeOutAnimation
+
+} // namespace LenovoLegionToolkit::Lib::AoTOSD::Animation

LenovoLegionToolkit.Lib.AoTOSD/AoTOSD.cpp

@@ -0,0 +1,103 @@
+#include"AoTOSD.h"
+#include"Animation/FadeOutAnimation.h"
+#include"Utils/BitmapConverter.h"
+#include"Utils/DesktopInfos.h"
+#include"Utils/GlobalLogger.h"
+
+#include<gdiplus.h>
+
+#define NOTIFICATIONWINDOWAOT_WINDOW_CLASSNAME L"LenovoLegionToolkit-OSDAOT"
+#define NOTIFICATIONWINDOWAOT_WINDOW_TITLE L"LenovoLegionToolkit-OSDAOT"
+
+using namespace System;
+
+namespace AoTOSD = LenovoLegionToolkit::Lib::AoTOSD;
+
+AoTOSD::NotificationWindowAoT::NotificationWindowAoT() {
+    this->_window = new Window::OSDWindow(
+        NOTIFICATIONWINDOWAOT_WINDOW_CLASSNAME,
+        NOTIFICATIONWINDOWAOT_WINDOW_TITLE
+    );
+}
+
+AoTOSD::NotificationWindowAoT::~NotificationWindowAoT() {
+    delete this->_window;
+}
+
+void AoTOSD::NotificationWindowAoT::Show(Drawing::Bitmap^ bitmap, NotificationPosition pos, NotificationDuration duration) {
+    this->_window->SetBitmap(Utils::BitmapConverter::Convert(bitmap));
+    this->UpdateOSDWindowPosition(pos);
+    this->UpdateOSDWindowVisibleDuration(duration);
+    this->_window->Show();
+}
+
+void AoTOSD::NotificationWindowAoT::UpdateOSDWindowPosition(NotificationPosition pos) {
+    POINT newPos = { 0 };
+    int width = this->_window->GetSizeWidth();
+    int height = this->_window->GetSizeHeight();
+    RECT desktopWorkingArea = Utils::DesktopInfos::GetPrimaryDesktopWorkingArea();
+    switch (pos)
+    {
+        case NotificationPosition::BottomLeft:
+            newPos.x = desktopWorkingArea.left + this->Margin;
+            newPos.y = desktopWorkingArea.bottom - height - this->Margin;
+            break;
+        case NotificationPosition::BottomCenter:
+            newPos.x = (desktopWorkingArea.right - width) / 2;
+            newPos.y = desktopWorkingArea.bottom - height - this->Margin;
+            break;
+        case NotificationPosition::BottomRight:
+            newPos.x = desktopWorkingArea.right - width - this->Margin;
+            newPos.y = desktopWorkingArea.bottom - height - this->Margin;
+            break;
+        case NotificationPosition::CenterLeft:
+            newPos.x = desktopWorkingArea.left + this->Margin;
+            newPos.y = (desktopWorkingArea.bottom - height) / 2;
+            break;
+        case NotificationPosition::Center:
+            newPos.x = (desktopWorkingArea.right - width) / 2;
+            newPos.y = (desktopWorkingArea.bottom - height) / 2;
+            break;
+        case NotificationPosition::CenterRight:
+            newPos.x = desktopWorkingArea.right - width - this->Margin;
+            newPos.y = (desktopWorkingArea.bottom - height) / 2;
+            break;
+        case NotificationPosition::TopLeft:
+            newPos.x = desktopWorkingArea.left + this->Margin;
+            newPos.y = desktopWorkingArea.top + this->Margin;
+            break;
+        case NotificationPosition::TopCenter:
+            newPos.x = (desktopWorkingArea.right - width) / 2;
+            newPos.y = desktopWorkingArea.top + this->Margin;
+            break;
+        case NotificationPosition::TopRight:
+            newPos.x = desktopWorkingArea.right - width - this->Margin;
+            newPos.y = desktopWorkingArea.top + this->Margin;
+            break;
+        default:
+            Log() << L"Illegal notification position given, use center as default.";
+            newPos.x = (desktopWorkingArea.right - width) / 2;
+            newPos.y = (desktopWorkingArea.bottom - height) / 2;
+            break;
+    }
+    this->_window->SetPosition(newPos);
+}
+
+void AoTOSD::NotificationWindowAoT::UpdateOSDWindowVisibleDuration(NotificationDuration duration) {
+    switch (duration)
+    {
+        case NotificationDuration::Short:
+            this->_window->SetVisibleDuration(500);
+            break;
+        case NotificationDuration::Normal:
+            this->_window->SetVisibleDuration(1000);
+            break;
+        case NotificationDuration::Long:
+            this->_window->SetVisibleDuration(2500);
+            break;
+        default:
+            Log() << L"Illegal visible duration given, use normal as default.";
+            this->_window->SetVisibleDuration(1500);
+            break;
+    }
+}

LenovoLegionToolkit.Lib.AoTOSD/AoTOSD.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include"Window/OSDWindow.h"
+
+namespace LenovoLegionToolkit::Lib::AoTOSD {
+
+    public ref class NotificationWindowAoT {
+
+    public:
+        NotificationWindowAoT();
+        ~NotificationWindowAoT();
+
+        void Show(::System::Drawing::Bitmap^ bitmap, NotificationPosition pos, NotificationDuration duration);
+
+    private:
+        Window::OSDWindow* _window;
+        static const int Margin = 16;
+
+        void UpdateOSDWindowPosition(NotificationPosition pos);
+        void UpdateOSDWindowVisibleDuration(NotificationDuration duration);
+
+    }; // public ref class NotificationWindowAoT
+
+} // namespace LenovoLegionToolkit::Lib::AoTOSD