Skip to content

Commit 3f5a2f3

Browse files
committed
Some fixes
1 parent 43c08cd commit 3f5a2f3

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

src/Myra/Graphics2D/UI/Containers/ScrollViewer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ protected override void InternalArrange()
578578
_thumbMaximumY = 1;
579579
}
580580

581-
if (_horizontalScrollingOn)
581+
if (_horizontalScrollingOn && ShowHorizontalScrollBar)
582582
{
583583
bounds.Width = measureSize.X;
584584
}
@@ -587,7 +587,7 @@ protected override void InternalArrange()
587587
bounds.Width = availableSize.X;
588588
}
589589

590-
if (_verticalScrollingOn)
590+
if (_verticalScrollingOn && ShowVerticalScrollBar)
591591
{
592592
bounds.Height = measureSize.Y;
593593
}

src/Myra/Graphics2D/UI/Desktop.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ public Desktop()
314314
KeyDownHandler = OnKeyDown;
315315

316316
#if FNA
317+
TextInputEXT.StartTextInput();
317318
TextInputEXT.TextInput += OnChar;
318319
#endif
319320

src/Myra/Graphics2D/UI/File/FileDialog.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,13 @@ public FileDialog(FileDialogMode mode) : base(null)
177177
SetStyle(Stylesheet.DefaultStyleName);
178178
}
179179

180+
protected override void OnPlacedChanged()
181+
{
182+
base.OnPlacedChanged();
183+
184+
UpdateFolder();
185+
}
186+
180187
/// <summary>
181188
/// Create the navigation menu of places we can visit.
182189
/// </summary>
@@ -401,6 +408,11 @@ private void UpdateFolder()
401408
_paths.Clear();
402409

403410
_scrollPane.ScrollPosition = Mathematics.PointZero;
411+
412+
if (Desktop == null)
413+
{
414+
return;
415+
}
404416

405417
var path = _textFieldPath.Text;
406418

0 commit comments

Comments
 (0)