1) fixed right click on linux

2) SelectableTextBlock.axaml in gallery textblock 3) default template for SelectableTextBlock.axaml
jinek · Dec 19, 2024 · f299a2a · f299a2a
1 parent ee3e836
commit f299a2a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTextBlock.axaml b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTextBlock.axaml
@@ -20,6 +20,9 @@
                    FontWeight="Bold"
                    Background="DarkMagenta"
                    Foreground="Chartreuse" />
+        <SelectableTextBlock  SelectionStart="17" SelectionEnd="26">
+            Selectable text: Loreum ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. Curabitur massa. Donec eleifend, libero at sagittis
+        </SelectableTextBlock>
 
         <StackPanel Orientation="Vertical"
                     Margin="0"

diff --git a/src/Consolonia.PlatformSupport/CursesConsole.cs b/src/Consolonia.PlatformSupport/CursesConsole.cs
@@ -93,12 +93,12 @@ private static readonly FlagTranslator<Key, ConsoleKey>
                 (Curses.Event.Button1Pressed, RawPointerEventType.LeftButtonDown),
                 (Curses.Event.Button1Clicked, RawPointerEventType.LeftButtonDown),
                 (Curses.Event.Button1Released, RawPointerEventType.LeftButtonUp),
-                (Curses.Event.Button2Pressed, RawPointerEventType.RightButtonDown),
-                (Curses.Event.Button2Clicked, RawPointerEventType.RightButtonDown),
-                (Curses.Event.Button2Released, RawPointerEventType.RightButtonUp),
-                (Curses.Event.Button3Pressed, RawPointerEventType.MiddleButtonDown),
-                (Curses.Event.Button3Clicked, RawPointerEventType.MiddleButtonDown),
-                (Curses.Event.Button3Released, RawPointerEventType.MiddleButtonUp),
+                (Curses.Event.Button2Pressed, RawPointerEventType.MiddleButtonDown),
+                (Curses.Event.Button2Clicked, RawPointerEventType.MiddleButtonDown),
+                (Curses.Event.Button2Released, RawPointerEventType.MiddleButtonUp),
+                (Curses.Event.Button3Pressed, RawPointerEventType.RightButtonDown),
+                (Curses.Event.Button3Clicked, RawPointerEventType.RightButtonDown),
+                (Curses.Event.Button3Released, RawPointerEventType.RightButtonUp),
                 (Curses.Event.Button4Pressed, RawPointerEventType.XButton1Down),
                 (Curses.Event.Button4Clicked, RawPointerEventType.XButton1Down),
                 (Curses.Event.Button4Released, RawPointerEventType.XButton1Up),

diff --git a/src/Consolonia.Themes/Templates/Controls/AllControls.axaml b/src/Consolonia.Themes/Templates/Controls/AllControls.axaml
@@ -4,6 +4,7 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <MergeResourceInclude Source="/Templates/Controls/TextBlock.axaml" />
+                <MergeResourceInclude Source="/Templates/Controls/SelectableTextBlock.axaml"/>
                 <MergeResourceInclude Source="/Templates/Controls/Window.axaml" />
                 <MergeResourceInclude Source="/Templates/Controls/Button.axaml" />
                 <MergeResourceInclude Source="/Templates/Controls/TextBox.axaml" />

diff --git a/src/Consolonia.Themes/Templates/Controls/SelectableTextBlock.axaml b/src/Consolonia.Themes/Templates/Controls/SelectableTextBlock.axaml
@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme x:Key="{x:Type SelectableTextBlock}"
+                  TargetType="SelectableTextBlock">
+        <Setter Property="SelectionBrush" Value="{StaticResource ThemeActionBackgroundBrush}"/>
+    </ControlTheme>
+</ResourceDictionary>