Thanks to visit codestin.com
Credit goes to github.com

Skip to content

R3.2 support23 h2 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 29, 2023
Merged

R3.2 support23 h2 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d6df2d2
Added secondary closk config. fixed widget rect combine.
Gniang Sep 18, 2023
f681abb
Merge remote-tracking branch 'origin/master' into R3.1clock2
Gniang Sep 18, 2023
fa32f04
support 23H2 dynamic mode, but including perfomance issue.
Gniang Sep 23, 2023
8b65187
fix performance issue. need check com object releasing.
Gniang Sep 24, 2023
b4a8c5e
Fixed a bug that the clock display settings were not being retained.
Gniang Sep 24, 2023
f68304d
Merge branch 'R3.1clock2' into R3.2_support23H2
Gniang Sep 24, 2023
09e9edc
Merge branch 'R3.2_support23H2' of https://github.com/Gniang/RoundedT…
Gniang Sep 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions RoundedTB/Background.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public void DoWork(object sender, DoWorkEventArgs e)
break;
}
// Get the latest quick details of this taskbar
Types.Taskbar newTaskbar = Taskbar.GetQuickTaskbarRects(taskbars[current].TaskbarHwnd, taskbars[current].TrayHwnd, taskbars[current].AppListHwnd);
Types.Taskbar newTaskbar = Taskbar.GetQuickTaskbarRects(taskbars[current].TaskbarHwnd, taskbars[current].TrayHwnd, taskbars[current].AppListHwnd, taskbars[current].AppListXaml);


// If the taskbar's monitor has a maximised window, reset it so it's "filled"
Expand Down Expand Up @@ -159,7 +159,6 @@ public void DoWork(object sender, DoWorkEventArgs e)
taskbars[current].Ignored = true;
settings.ShowWidgets = false;
}

}
}

Expand Down
19 changes: 19 additions & 0 deletions RoundedTB/EnumerableExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace RoundedTB
{
public static class EnumerableExtensions
{
public static void ForEach<T>(this IEnumerable<T> src, Action<T> action)
{
foreach (var item in src)
{
action(item);
}
}
}
}
11 changes: 11 additions & 0 deletions RoundedTB/Interaction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ public Types.Settings ReadJSON()
{
string jsonSettings = File.ReadAllText(mw.configPath);
Types.Settings settings = JsonConvert.DeserializeObject<Types.Settings>(jsonSettings);
// compatible old settings
if (settings.DynamicSecondaryClockLayout == null)
{
settings.DynamicSecondaryClockLayout = new Types.SegmentSettings { CornerRadius = 7, MarginLeft = 3, MarginTop = 3, MarginRight = 3, MarginBottom = 3 };
}
return settings;
}

Expand Down Expand Up @@ -63,6 +68,9 @@ public void FileSystem()
DynamicAppListLayout = new Types.SegmentSettings { CornerRadius = 7, MarginLeft = 3, MarginTop = 3, MarginRight = 3, MarginBottom = 3 },
DynamicTrayLayout = new Types.SegmentSettings { CornerRadius = 7, MarginLeft = 3, MarginTop = 3, MarginRight = 3, MarginBottom = 3 },
DynamicWidgetsLayout = new Types.SegmentSettings { CornerRadius = 7, MarginLeft = 3, MarginTop = 3, MarginRight = 3, MarginBottom = 3 },
DynamicSecondaryClockLayout = new Types.SegmentSettings { CornerRadius = 7, MarginLeft = 3, MarginTop = 3, MarginRight = 3, MarginBottom = 3 },
WidgetsWidth = 168,
ClockWidth = 110,
IsDynamic = false,
IsCentred = false,
IsWindows11 = true,
Expand All @@ -83,6 +91,9 @@ public void FileSystem()
DynamicAppListLayout = new Types.SegmentSettings { CornerRadius = 16, MarginLeft = 2, MarginTop = 2, MarginRight = 2, MarginBottom = 2 },
DynamicTrayLayout = new Types.SegmentSettings { CornerRadius = 16, MarginLeft = 2, MarginTop = 2, MarginRight = 2, MarginBottom = 2 },
DynamicWidgetsLayout = new Types.SegmentSettings { CornerRadius = 16, MarginLeft = 2, MarginTop = 2, MarginRight = 2, MarginBottom = 2 },
DynamicSecondaryClockLayout = new Types.SegmentSettings { CornerRadius = 16, MarginLeft = 2, MarginTop = 2, MarginRight = 2, MarginBottom = 2 },
WidgetsWidth = 168,
ClockWidth = 110,
IsDynamic = false,
IsCentred = false,
IsWindows11 = false,
Expand Down
23 changes: 16 additions & 7 deletions RoundedTB/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,17 @@
<wpfui:Button x:Name="aboutButton" Appearance="Secondary" Margin="0,0,10,47" VerticalAlignment="Bottom" Content="Help" Click="aboutButton_Click" FontWeight="Normal" HorizontalAlignment="Right" Width="133" Height="31"/>
<wpfui:Button x:Name="applyButton" Margin="0,0,10,10" VerticalAlignment="Bottom" Content="Apply" Click="ApplyButton_Click" FontWeight="Normal" HorizontalAlignment="Right" Width="133" Height="32"/>

<CheckBox x:Name="dynamicCheckBox" Content="Dynamic mode" Margin="0,210,53,0" Checked="dynamicCheckBox_Checked" Unchecked="dynamicCheckBox_Unchecked" VerticalAlignment="Top" RenderTransformOrigin="1.763,4.069" Visibility="Visible" HorizontalAlignment="Right" Width="116"/>
<CheckBox x:Name="showTrayCheckBox" Content="Show this segment" Margin="0,210,44,0" VerticalAlignment="Top" HorizontalAlignment="Right" Width="134" Visibility="Hidden"/>
<CheckBox x:Name="showWidgetsCheckBox" Content="Show this segment" Margin="0,210,44,0" VerticalAlignment="Top" HorizontalAlignment="Right" Width="134" Visibility="Hidden"/>
<Grid Width="202" Margin="0,190,10,0" VerticalAlignment="Top" HorizontalAlignment="Right" >
<Label x:Name="widgetWidthLabel" Content="Width" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,0,0,0" Width="60" Visibility="Hidden" />
<TextBox x:Name="widgetWidthInput" HorizontalAlignment="Left" Margin="0,17,0,0" TextWrapping="NoWrap" Text="" VerticalAlignment="Top" Width="60" Visibility="Hidden" />
<Label x:Name="clockWidthLabel" Content="Width" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,0,0,0" Width="60" Visibility="Hidden" />
<TextBox x:Name="clockWidthInput" HorizontalAlignment="Left" Margin="0,17,0,0" TextWrapping="NoWrap" Text="" VerticalAlignment="Top" Width="60" Visibility="Hidden" />

<CheckBox x:Name="dynamicCheckBox" Content="Dynamic mode" Margin="70,12,0,0" Padding="0" Checked="dynamicCheckBox_Checked" Unchecked="dynamicCheckBox_Unchecked" RenderTransformOrigin="1.763,4.069" Visibility="Visible" Width="116" HorizontalAlignment="Left" />
<CheckBox x:Name="showTrayCheckBox" Content="Show tray" Margin="70,12,0,0" Padding="0" Visibility="Hidden" HorizontalAlignment="Left" />
<CheckBox x:Name="showWidgetsCheckBox" Content="Show widget" Margin="70,12,0,0" Padding="0" Visibility="Hidden" HorizontalAlignment="Left" />
<CheckBox x:Name="showClockCheckBox" Content="Show clock" Margin="70,12,0,0" Padding="0" Visibility="Hidden" HorizontalAlignment="Left" />
</Grid>

<CheckBox x:Name="centredCheckBox" Content="Centred taskbar?" Margin="10,62,0,0" VerticalAlignment="Top" Visibility="Hidden"/>
<Button x:Name="splitHelpButton" Opacity="0.001" Content="Click me!" Margin="107,122,0,0" Click="splitHelpButton_Click" Height="32" Width="94" VerticalAlignment="Top" FontWeight="Normal" FontFamily="Segoe UI Semibold" Visibility="Hidden"/>
Expand All @@ -74,14 +82,15 @@

<Label x:Name="mRightLabel" Content="Right Margin" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="108,56,0,0" Width="84"/>
<TextBox x:Name="mRightInput" HorizontalAlignment="Left" Margin="108,76,0,0" TextWrapping="NoWrap" Text="" VerticalAlignment="Top" Width="94" LostFocus="mRightInput_LostFocus"/>

</Grid>

<Grid x:Name="tbDiagramGrid" Margin="10,0,0,0" Height="247" VerticalAlignment="Top" HorizontalAlignment="Left" Width="486">
<Rectangle Stroke="#30242424" Fill="#20808080" RadiusX="5" RadiusY="5"/>
<wpfui:Button x:Name="taskbarRectStandIn" Margin="126,0,126,5" VerticalAlignment="Bottom" Click="taskbarRectStandIn_Click" Appearance="Primary" Height="32"/>
<wpfui:Button x:Name="trayRectStandIn" Margin="415,0,5,5" Click="trayRectStandIn_Click" VerticalAlignment="Bottom" Height="32" Appearance="Secondary"/>
<wpfui:Button x:Name="widgetsRectStandIn" Margin="5,0,415,5" Click="widgetsRectStandIn_Click" VerticalAlignment="Bottom" Height="32" Appearance="Secondary"/>
<wpfui:Button x:Name="taskbarRectStandIn" Margin="126,0,126,5" VerticalAlignment="Bottom" Click="taskbarRectStandIn_Click" Appearance="Primary" Height="32"></wpfui:Button>
<wpfui:Button x:Name="trayRectStandIn" Margin="415,0,5,5" Click="trayRectStandIn_Click" VerticalAlignment="Bottom" Height="32" Appearance="Secondary" Padding="0">📅</wpfui:Button>
<wpfui:Button x:Name="widgetsRectStandIn" Margin="5,0,415,5" Click="widgetsRectStandIn_Click" VerticalAlignment="Bottom" Height="32" Appearance="Secondary" Padding="0">📰</wpfui:Button>
<wpfui:Button x:Name="clockRectStandIn" Margin="415,0,5,60" Click="clockRectStandIn_Click" VerticalAlignment="Bottom" Height="32" Appearance="Secondary" VerticalContentAlignment="Center" Padding="0">🕑</wpfui:Button>

<Label Content="RoundedTB" HorizontalAlignment="Center" Margin="0,59,0,108" FontFamily="Segoe UI Variable Display" FontWeight="SemiBold" FontSize="60" Opacity="0.75"/>
<Label Content="To begin, select a taskbar segment below." HorizontalAlignment="Center" Margin="0,138,0,75" FontFamily="Segoe UI Variable Display" FontWeight="SemiBold" FontSize="20" Opacity="0.75"/>
Expand Down
Loading