浏览代码

Added the ability to copy from a readonly textbox

[email protected] 7 年之前
父节点
当前提交
33172127cc
共有 2 个文件被更改,包括 7 次插入1 次删除
  1. 1 1
      samples/ControlCatalog/Pages/TextBoxPage.xaml
  2. 6 0
      src/Avalonia.Controls/Presenters/TextPresenter.cs

+ 1 - 1
samples/ControlCatalog/Pages/TextBoxPage.xaml

@@ -9,7 +9,7 @@
               Gap="16">
               Gap="16">
       <StackPanel Orientation="Vertical" Gap="8">
       <StackPanel Orientation="Vertical" Gap="8">
         <TextBox Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit." Width="200" />
         <TextBox Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit." Width="200" />
-        <TextBox Watermark="ReadOnly" IsReadOnly="True"/>
+        <TextBox Watermark="ReadOnly" IsReadOnly="True" Text="This is read only"/>
         <TextBox Width="200" Watermark="Watermark" />
         <TextBox Width="200" Watermark="Watermark" />
         <TextBox Width="200"
         <TextBox Width="200"
                  Watermark="Floating Watermark"
                  Watermark="Floating Watermark"

+ 6 - 0
src/Avalonia.Controls/Presenters/TextPresenter.cs

@@ -189,6 +189,12 @@ namespace Avalonia.Controls.Presenters
                     _caretTimer.Start();
                     _caretTimer.Start();
                     InvalidateVisual();
                     InvalidateVisual();
                 }
                 }
+                else
+                {
+                    _caretTimer.Start();
+                    InvalidateVisual();
+                    _caretTimer.Stop();
+                }
 
 
                 if (IsMeasureValid)
                 if (IsMeasureValid)
                 {
                 {