miao-moe/LanMountainDesktop
1
0
Fork 0
mirror of https://github.com/wwiinnddyy/LanMountainDesktop.git synced 2026-06-22 17:24:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "0.7.0.1"

Browse Source 
This reverts commit ea8ce1f5ff.
This commit is contained in:
lincube
2026-03-20 14:12:40 +08:00
parent ea8ce1f5ff
commit 5d48a03f57
31 changed files with 602 additions and 2134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
LanMountainDesktop/Views/Components/CnrDailyNewsWidget.axaml.cs
View File

@@ -16,7 +16,6 @@ using Avalonia.Media;
using Avalonia.Media.Imaging;
using Avalonia.Styling;
using Avalonia.Threading;
using LanMountainDesktop.DesktopComponents.Runtime;
using LanMountainDesktop.Models;
using LanMountainDesktop.Services;
@@ -600,40 +599,17 @@ public partial class CnrDailyNewsWidget : UserControl, IDesktopComponentWidget,
News2TitleTextBlock.MaxWidth = availableTextWidth;
var newsFont = Math.Clamp(21 * scale, 10.5, 28);
var newsHeightBudget = Math.Max(28, imageHeight + columnGap * 2d);
var news1Layout = ComponentTypographyLayoutService.FitAdaptiveTextLayout(
News1TitleTextBlock.Text,
availableTextWidth,
newsHeightBudget,
minLines: 1,
maxLines: ComponentTypographyLayoutService.CountTextDisplayUnits(News1TitleTextBlock.Text) > 30 ? 2 : 1,
minFontSize: Math.Clamp(newsFont * 0.72, 10.5, 18),
maxFontSize: newsFont,
weightCandidates: new[] { FontWeight.SemiBold, FontWeight.Bold },
lineHeightFactor: 1.14d,
fontFamily: MiSansFontFamily);
var news2Layout = ComponentTypographyLayoutService.FitAdaptiveTextLayout(
News2TitleTextBlock.Text,
availableTextWidth,
newsHeightBudget,
minLines: 1,
maxLines: ComponentTypographyLayoutService.CountTextDisplayUnits(News2TitleTextBlock.Text) > 30 ? 2 : 1,
minFontSize: Math.Clamp(newsFont * 0.72, 10.5, 18),
maxFontSize: newsFont,
weightCandidates: new[] { FontWeight.SemiBold, FontWeight.Bold },
lineHeightFactor: 1.14d,
fontFamily: MiSansFontFamily);
News1TitleTextBlock.FontSize = news1Layout.FontSize;
News1TitleTextBlock.LineHeight = news1Layout.LineHeight;
News1TitleTextBlock.MinHeight = news1Layout.LineHeight * news1Layout.MaxLines;
News1TitleTextBlock.MaxLines = news1Layout.MaxLines;
News1TitleTextBlock.FontWeight = news1Layout.Weight;
News2TitleTextBlock.FontSize = news2Layout.FontSize;
News2TitleTextBlock.LineHeight = news2Layout.LineHeight;
News2TitleTextBlock.MinHeight = news2Layout.LineHeight * news2Layout.MaxLines;
News2TitleTextBlock.MaxLines = news2Layout.MaxLines;
News2TitleTextBlock.FontWeight = news2Layout.Weight;
News1TitleTextBlock.FontSize = newsFont;
News2TitleTextBlock.FontSize = newsFont;
var mainNewsLineHeight = newsFont * 1.14;
News1TitleTextBlock.LineHeight = mainNewsLineHeight;
News2TitleTextBlock.LineHeight = mainNewsLineHeight;
var mainNewsMinHeight = mainNewsLineHeight * 2;
News1TitleTextBlock.MinHeight = mainNewsMinHeight;
News2TitleTextBlock.MinHeight = mainNewsMinHeight;
StatusTextBlock.FontSize = Math.Clamp(16 * scale, 9, 24);
News1TitleTextBlock.MaxLines = 2;
News2TitleTextBlock.MaxLines = 2;
foreach (var row in _extraNewsRows)
{
@@ -647,23 +623,11 @@ public partial class CnrDailyNewsWidget : UserControl, IDesktopComponentWidget,
row.ImageHost.Height = imageHeight;
row.ImageHost.CornerRadius = ComponentChromeCornerRadiusHelper.Scale(16 * scale, 8, 22);
var rowTitleLayout = ComponentTypographyLayoutService.FitAdaptiveTextLayout(
row.TitleTextBlock.Text,
availableTextWidth,
Math.Max(32, imageHeight + columnGap),
minLines: 1,
maxLines: ComponentTypographyLayoutService.CountTextDisplayUnits(row.TitleTextBlock.Text) > 28 ? 2 : 1,
minFontSize: Math.Clamp(19 * scale, 10, 16),
maxFontSize: Math.Clamp(19 * scale, 10, 25),
weightCandidates: new[] { FontWeight.SemiBold, FontWeight.Bold },
lineHeightFactor: 1.12d,
fontFamily: MiSansFontFamily);
row.TitleTextBlock.MaxWidth = availableTextWidth;
row.TitleTextBlock.FontSize = rowTitleLayout.FontSize;
row.TitleTextBlock.LineHeight = rowTitleLayout.LineHeight;
row.TitleTextBlock.MinHeight = rowTitleLayout.LineHeight * rowTitleLayout.MaxLines;
row.TitleTextBlock.MaxLines = rowTitleLayout.MaxLines;
row.TitleTextBlock.FontWeight = rowTitleLayout.Weight;
row.TitleTextBlock.FontSize = Math.Clamp(19 * scale, 10, 25);
row.TitleTextBlock.LineHeight = row.TitleTextBlock.FontSize * 1.12;
row.TitleTextBlock.MinHeight = row.TitleTextBlock.LineHeight * 2;
row.TitleTextBlock.MaxLines = 2;
}
ExtraNewsItemsPanel.Spacing = Math.Clamp(6 * scale, 3, 10);