Browse Source

Update AvalonDock to 1.1.1714, fixed focus bug when there are secondary view contents.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@3638 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 17 years ago
parent
commit
d1575ceb4f
  1. 701
      src/Libraries/AvalonDock/AvalonDock.XML
  2. BIN
      src/Libraries/AvalonDock/AvalonDock.dll
  3. 6
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextArea.cs
  4. 1
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextEditor.xaml
  5. 4
      src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs

701
src/Libraries/AvalonDock/AvalonDock.XML

File diff suppressed because it is too large Load Diff

BIN
src/Libraries/AvalonDock/AvalonDock.dll

Binary file not shown.

6
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextArea.cs

@ -38,6 +38,10 @@ namespace ICSharpCode.AvalonEdit
typeof(TextArea), new FrameworkPropertyMetadata(Boxes.True)); typeof(TextArea), new FrameworkPropertyMetadata(Boxes.True));
KeyboardNavigation.TabNavigationProperty.OverrideMetadata( KeyboardNavigation.TabNavigationProperty.OverrideMetadata(
typeof(TextArea), new FrameworkPropertyMetadata(KeyboardNavigationMode.None)); typeof(TextArea), new FrameworkPropertyMetadata(KeyboardNavigationMode.None));
FocusableProperty.OverrideMetadata(
typeof(TextArea), new FrameworkPropertyMetadata(Boxes.True));
FocusVisualStyleProperty.OverrideMetadata(
typeof(TextArea), new FrameworkPropertyMetadata(null));
} }
/// <summary> /// <summary>
@ -440,6 +444,7 @@ namespace ICSharpCode.AvalonEdit
{ {
base.OnGotKeyboardFocus(e); base.OnGotKeyboardFocus(e);
caret.Show(); caret.Show();
e.Handled = true;
} }
/// <inheritdoc/> /// <inheritdoc/>
@ -447,6 +452,7 @@ namespace ICSharpCode.AvalonEdit
{ {
base.OnLostKeyboardFocus(e); base.OnLostKeyboardFocus(e);
caret.Hide(); caret.Hide();
e.Handled = true;
} }
IReadOnlySectionProvider readOnlySectionProvider = NoReadOnlySections.Instance; IReadOnlySectionProvider readOnlySectionProvider = NoReadOnlySections.Instance;

1
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextEditor.xaml

@ -48,6 +48,5 @@
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
</Style> </Style>
</ResourceDictionary> </ResourceDictionary>

4
src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs

@ -230,10 +230,6 @@ namespace ICSharpCode.SharpDevelop.Gui
{ {
if (viewTabControl == null) { if (viewTabControl == null) {
viewTabControl = new TabControl(); viewTabControl = new TabControl();
viewTabControl.GotFocus += delegate {
TabItem page = (TabItem)viewTabControl.SelectedItem;
if (!page.IsFocused) page.Focus();
};
viewTabControl.TabStripPlacement = Dock.Bottom; viewTabControl.TabStripPlacement = Dock.Bottom;
this.SetContent(viewTabControl); this.SetContent(viewTabControl);

Loading…
Cancel
Save