chore: update assembly name; more fine tune fixes for drag position.

samir-dahal · Mar 24, 2024 · 5e39ec0 · 5e39ec0
1 parent 6504887
commit 5e39ec0
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 20 deletions.
diff --git a/SambatWidget.Core/BaseCalendarRenderer.cs b/SambatWidget.Core/BaseCalendarRenderer.cs
@@ -67,8 +67,22 @@ public string GetConsecutiveEnglishMonthsPair()
                 return remainingDays;
             }
         }
-        public string GetWeekDayName() => _carouselNepDate.EnglishDate.DayOfWeek.ToString();
-        public string GetShortWeekDayName() => _carouselNepDate.EnglishDate.ToString("ddd");
+        public string GetWeekDayName()
+        {
+            if (!IsToday())
+            {
+                return GetThisMonthNepaliStartDate().DayOfWeek.ToString();
+            }
+            return DateTime.Now.DayOfWeek.ToString();
+        }
+        public string GetShortWeekDayName()
+        {
+            if (!IsToday())
+            {
+                return GetThisMonthNepaliStartDate().EnglishDate.ToString("ddd");
+            }
+            return DateTime.Now.ToString("ddd");
+        }
         public bool IsToday() => NepaliDate.Now == _carouselNepDate;
         public string GetFormattedEnglishDate() => _carouselNepDate.EnglishDate.ToString("dd MMM, yyyy");
         public string GetFormattedNepaliDate()
@@ -97,15 +111,15 @@ private IEnumerable<WidgetCalendarCellModel> Render()
         {
             return PrepareCalendarDataGrid(Populate());
         }
-        private int GetThisMonthStartDateIndex()
+        private NepaliDate GetThisMonthNepaliStartDate()
         {
-            return (int)new NepaliDate(_carouselNepDate.Year, _carouselNepDate.Month, 1).DayOfWeek;
+            return new NepaliDate(_carouselNepDate.Year, _carouselNepDate.Month, 1);
         }
         private IEnumerable<WidgetCalendarCellModel> PrepareCalendarDataGrid(List<WidgetCalendarCellModel> cells)
         {
             int currRow = 0;
             int currCol = 0;
-            int monthStartDateIndex = GetThisMonthStartDateIndex();
+            int monthStartDateIndex = (int)GetThisMonthNepaliStartDate().DayOfWeek;
             for (int i = 0; i < cells.Count(); i++)
             {
                 if (currRow == 4 && currCol == 6)

diff --git a/SambatWidget.UI/MainWindow.xaml.cs b/SambatWidget.UI/MainWindow.xaml.cs
@@ -53,35 +53,41 @@ protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
         protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
         {
             if (!_settings.Loaded) return;
-            if (!_settings.DefaultPositionSet)
+            else if (!_settings.DefaultPositionSet)
             {
                 _settings.SetDefaultPosition(InitPosition);
-                CalculateAndSaveWindowMoveOffset();
-                return;
             }
-            base.OnRenderSizeChanged(sizeInfo);
-            try
+            else
             {
-                if (!_vm.IsExpanded)
-                {
-                    this.Top = (App.Setting.Position.Y + _settings.WindowHeight) - this.WidgetHeader.ActualHeight;
-                }
-                else
-                {
-                    this.Top = (App.Setting.Position.Y + this.WidgetHeader.ActualHeight) - this.ActualHeight;
-                }
+                base.OnRenderSizeChanged(sizeInfo);
             }
-            finally
+            if (_settings.IsRenderedAfterMouseAction)
             {
-                CalculateAndSaveWindowMoveOffset();
+                CalculateWidgetPositionState();
+                _settings.SetMouseActionRender(false);
             }
+            CalculateAndSaveWindowMoveOffset();
         }
+
+        private void CalculateWidgetPositionState()
+        {
+            if (!_vm.IsExpanded)
+            {
+                this.Top = (App.Setting.Position.Y + _settings.WindowHeight) - this.WidgetHeader.ActualHeight;
+            }
+            else
+            {
+                this.Top = (App.Setting.Position.Y + this.WidgetHeader.ActualHeight) - this.ActualHeight;
+            }
+        }
+
         protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
         {
             base.OnMouseLeftButtonUp(e);
             try
             {
                 IsMouseDown = false;
+                _settings.SetMouseActionRender(true);
                 if (_settings.Position.X == this.Left && _settings.Position.Y == this.Top)
                 {
                     _vm.ToggleExpandCommand.Execute(null);
@@ -114,6 +120,23 @@ protected override void OnKeyUp(KeyEventArgs e)
                     break;
             }
         }
+        protected override void OnDeactivated(EventArgs e)
+        {
+            base.OnDeactivated(e);
+            try
+            {
+                _settings.SetWindowHeight(this.ActualHeight);
+                _settings.SetMouseActionRender(true);
+                if (App.Setting.MinimizeOnLostFocus && !App.IsShuttingDown)
+                {
+                    _vm.MinimizeWidgetCommand.Execute(null);
+                }
+            }
+            finally
+            {
+                CalculateAndSaveWindowMoveOffset();
+            }
+        }
         private void CalculateAndSaveWindowMoveOffset()
         {
             this.CalculateWindowMoveOffset();

diff --git a/SambatWidget.UI/Models/SettingModel.cs b/SambatWidget.UI/Models/SettingModel.cs
@@ -10,6 +10,7 @@ public class SettingModel
         public bool LockPosition { get; set; }
         public bool AllowTransparency { get; set; }
         public string TimeZone { get; set; }
+        public bool MinimizeOnLostFocus { get; set; }
         public bool ShowTimeZoneOffset { get; set; }
         public bool AutoRunAtStartup { get; set; }
         public bool AllowGlobalPosition { get; set; } = true;

diff --git a/SambatWidget.UI/Models/WidgetWindowSetting.cs b/SambatWidget.UI/Models/WidgetWindowSetting.cs
@@ -12,6 +12,7 @@ public class WidgetWindowSetting
     {
         public bool Loaded { get; private set; }
         public bool DefaultPositionSet { get; private set; }
+        public bool IsRenderedAfterMouseAction { get; private set; }
         public Point Position { get; private set; }
         public double WindowHeight { get; private set; }
         public WidgetWindowSetting()
@@ -36,5 +37,9 @@ public void SetDefaultPosition(Action action)
             action();
             DefaultPositionSet = true;
         }
+        public void SetMouseActionRender(bool isMouseAction)
+        {
+            IsRenderedAfterMouseAction = isMouseAction;
+        }
     }
 }
diff --git a/SambatWidget.UI/Resources/WidgetContextMenus.xaml b/SambatWidget.UI/Resources/WidgetContextMenus.xaml
@@ -43,6 +43,11 @@
             Header="Show Timezone"
             IsCheckable="True"
             IsChecked="{Binding ShowTimeZone}" />
+        <MenuItem
+            Command="{Binding WidgetContextMenuViewModel.ToggleMinimizeOnLostFocusCommand}"
+            Header="Minimize On Lost Focus"
+            IsCheckable="True"
+            IsChecked="{Binding WidgetContextMenuViewModel.MinimizeOnLostFocus}" />
         <MenuItem
             Command="{Binding WidgetContextMenuViewModel.ToggleAutoRunAtStartupCommand}"
             Header="Autorun at startup"

diff --git a/SambatWidget.UI/SambatWidget.UI.csproj b/SambatWidget.UI/SambatWidget.UI.csproj
@@ -6,6 +6,7 @@
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<UseWPF>true</UseWPF>
+		<AssemblyName>SambatWidget</AssemblyName>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/SambatWidget.UI/ViewModels/WidgetContextMenuViewModel.cs b/SambatWidget.UI/ViewModels/WidgetContextMenuViewModel.cs
@@ -10,6 +10,9 @@ public partial class WidgetContextMenuViewModel : ObservableObject
         [ObservableProperty]
         bool isLocked = App.Setting.LockPosition;
 
+        [ObservableProperty]
+        bool minimizeOnLostFocus = App.Setting.MinimizeOnLostFocus;
+
         [ObservableProperty]
         bool globalPosition = App.Setting.AllowGlobalPosition;
 
@@ -47,6 +50,11 @@ private void LockPosition()
             App.Setting.LockPosition = IsLocked;
         }
         [RelayCommand]
+        private void ToggleMinimizeOnLostFocus()
+        {
+            App.Setting.MinimizeOnLostFocus = MinimizeOnLostFocus;
+        }
+        [RelayCommand]
         private void ShowSetting()
         {
             new SettingWindow().ShowDialog();

diff --git a/SambatWidget.UI/ViewModels/WidgetViewModel.cs b/SambatWidget.UI/ViewModels/WidgetViewModel.cs
@@ -50,6 +50,16 @@ private void ShowToday()
             });
         }
         [RelayCommand]
+        private void MinimizeWidget()
+        {
+            Render(() =>
+            {
+                IsExpanded = false;
+                App.Setting.IsExpanded = false;
+                DecideWhenToTransparent();
+            });
+        }
+        [RelayCommand]
         private void ToggleExpand()
         {
             Render(() =>