Skip to content

Commit 0a8be10

Browse files
committed
Resolving rebase conflicts
1 parent 74bd511 commit 0a8be10

File tree

4 files changed

+118
-123
lines changed

4 files changed

+118
-123
lines changed

Examples/UICatalog/Scenarios/TabViewExample.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
1+
using System.Text;
52

63
namespace UICatalog.Scenarios;
74

Terminal.Gui/Views/TabView/TabSide.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Terminal.Gui;
1+
namespace Terminal.Gui.Views;
22

33
/// <summary>
44
/// Defines tab side.

Terminal.Gui/Views/TabView/TabView.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public TabView ()
133133
Command.Up,
134134
() =>
135135
{
136-
if (_style.TabsOnBottom)
136+
if (_style.TabsSide == TabSide.Bottom)
137137
{
138138
if (_tabsBar is { HasFocus: true } && _containerView.CanFocus)
139139
{
@@ -176,7 +176,7 @@ public TabView ()
176176
Command.Down,
177177
() =>
178178
{
179-
if (_style.TabsOnBottom)
179+
if (_style.TabsSide == TabSide.Bottom)
180180
{
181181
if (_containerView is { HasFocus: true })
182182
{
@@ -224,8 +224,6 @@ public TabView ()
224224
KeyBindings.Add (Key.End, Command.RightEnd);
225225
KeyBindings.Add (Key.PageDown, Command.PageDown);
226226
KeyBindings.Add (Key.PageUp, Command.PageUp);
227-
KeyBindings.Add (Key.CursorUp, Command.Up);
228-
KeyBindings.Add (Key.CursorDown, Command.Down);
229227
}
230228

231229
/// <summary>

0 commit comments

Comments
 (0)