NotePad/MainWindow.axaml

@@ -4,27 +4,6 @@
         Title="Untitled - Notepad"
         Width="600" Height="400">
 
-    <Window.Styles>
-        <Style Selector="Menu">
-            <Setter Property="Background" Value="#D3D3D3"/>
-        </Style>
-        <Style Selector="MenuItem">
-            <Setter Property="Background" Value="#D3D3D3"/>
-            <Setter Property="Foreground" Value="Black"/>
-        </Style>
-        <Style Selector="MenuItem:pointerover /template/ Border#PART_LayoutRoot">
-            <Setter Property="Background" Value="#A9A9A9"/>
-        </Style>
-        <Style Selector="MenuItem:open /template/ Popup#PART_Popup > Border">
-            <Setter Property="Background" Value="#D3D3D3"/>
-            <Setter Property="BorderBrush" Value="#A9A9A9"/>
-            <Setter Property="BorderThickness" Value="1"/>
-        </Style>
-        <Style Selector="Separator">
-            <Setter Property="Background" Value="#A9A9A9"/>
-        </Style>
-    </Window.Styles>
-
     <DockPanel>
         <!-- Menu Bar -->
         <Menu DockPanel.Dock="Top">
@@ -50,7 +29,7 @@
             <MenuItem Header="F_ormat">
                 <MenuItem Header="_Word Wrap" x:Name="WordWrapMenuItem" Click="OnWordWrapToggle">
                     <MenuItem.Icon>
-                        <CheckBox x:Name="WordWrapCheckBox" IsChecked="False" IsHitTestVisible="False"/>
+                        <CheckBox x:Name="WordWrapCheckBox" IsChecked="True" IsHitTestVisible="False"/>
                     </MenuItem.Icon>
                 </MenuItem>
             </MenuItem>
@@ -64,7 +43,7 @@
             <TextBox x:Name="EditorTextBox"
                      AcceptsReturn="True"
                      AcceptsTab="True"
-                     TextWrapping="NoWrap"
+                     TextWrapping="Wrap"
                      VerticalAlignment="Stretch"
                      HorizontalAlignment="Stretch"
                      ScrollViewer.VerticalScrollBarVisibility="Auto"

NotePad/MainWindow.axaml.cs

@@ -294,17 +294,7 @@ namespace NotePad
             var textBox = this.FindControl<TextBox>("EditorTextBox")!;
 
             checkBox.IsChecked = !checkBox.IsChecked;
-
+            textBox.TextWrapping = checkBox.IsChecked == true ? TextWrapping.Wrap : TextWrapping.NoWrap;
-            if (checkBox.IsChecked == true)
-            {
-                textBox.TextWrapping = TextWrapping.Wrap;
-                ScrollViewer.SetHorizontalScrollBarVisibility(textBox, Avalonia.Controls.Primitives.ScrollBarVisibility.Disabled);
-            }
-            else
-            {
-                textBox.TextWrapping = TextWrapping.NoWrap;
-                ScrollViewer.SetHorizontalScrollBarVisibility(textBox, Avalonia.Controls.Primitives.ScrollBarVisibility.Auto);
-            }
         }
 
         // Edit Menu

NotePad/NotePad.csproj

@@ -7,7 +7,7 @@
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
         <ApplicationIcon>img\notepad-icon.ico</ApplicationIcon>
-        <Version>0.1.17</Version>
+        <Version>0.1.15</Version>
     </PropertyGroup>
 
     <ItemGroup>

README.md

@@ -2,9 +2,7 @@
 
 A simple cross-platform text editor built with Avalonia UI and .NET 8.
 
-| Windows                                                         | Linux |
+![Screenshot](NotePad/img/notepad-screenshot.png)
-|-----------------------------------------------------------------| ----- |
-| ![Windows Screenshot](NotePad/img/notepad-screenshot-win11.png) | ![Linux Screenshot](NotePad/img/notepad-screenshot-linux.png) |
 
 ## Installation