diff --git a/public/Nitrocid/Shell/Homepage/HomepageTools.cs b/public/Nitrocid/Shell/Homepage/HomepageTools.cs index 301c61d0d8..4d477b8083 100644 --- a/public/Nitrocid/Shell/Homepage/HomepageTools.cs +++ b/public/Nitrocid/Shell/Homepage/HomepageTools.cs @@ -108,6 +108,21 @@ public static void OpenHomepage() ScreenTools.SetCurrent(homeScreen); ColorTools.LoadBack(); + // Prepare the widget + var widget = + WidgetTools.CheckWidget(Config.MainConfig.HomepageWidget) ? + WidgetTools.GetWidget(Config.MainConfig.HomepageWidget) : + WidgetTools.GetWidget(nameof(AnalogClock)); + if (Config.MainConfig.EnableHomepageWidgets) + { + int widgetLeft = ConsoleWrapper.WindowWidth / 2 + ConsoleWrapper.WindowWidth % 2; + int widgetWidth = ConsoleWrapper.WindowWidth / 2 - 4; + int widgetHeight = ConsoleWrapper.WindowHeight - 11; + int widgetTop = 2; + string widgetInit = widget.Initialize(widgetLeft + 1, widgetTop + 1, widgetWidth, widgetHeight); + TextWriterRaw.WriteRaw(widgetInit); + } + // Now, render the homepage homeScreenBuffer.AddDynamicText(() => { @@ -174,13 +189,8 @@ public static void OpenHomepage() // Render the widget if (Config.MainConfig.EnableHomepageWidgets) { - var widget = - WidgetTools.CheckWidget(Config.MainConfig.HomepageWidget) ? - WidgetTools.GetWidget(Config.MainConfig.HomepageWidget) : - WidgetTools.GetWidget(nameof(AnalogClock)); - string widgetInit = widget.Initialize(widgetLeft + 1, widgetTop + 1, widgetWidth, widgetHeight); string widgetSeq = widget.Render(widgetLeft + 1, widgetTop + 1, widgetWidth, widgetHeight); - builder.Append(widgetInit + widgetSeq); + builder.Append(widgetSeq); } // Render the first three RSS feeds