Commit 9a8f55b8 authored by Volker Weck's avatar Volker Weck
Browse files

Merge branch 'update' into 'main'

BugFix navigation

See merge request eclipse/skybt/libraries!14
parents ae704e7a 53b2b284
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
using System;
using System.Threading.Tasks;

using Common.UI.Interfaces.Navigation;

@@ -21,7 +22,8 @@ public partial class UserControlViewModelBase : ObservableObject, INavigationAwa
    /// </summary>
    /// <param name="fromViewModel"> The optional ViewModel instance from where navigation has been started. </param>
    /// <param name="data"> The optional data, which is passed to the navigated ViewModel. </param>
    public void Enter( object? fromViewModel, object? data = null ) {
    public Task Enter( object? fromViewModel, object? data = null ) {
        this.NavigationText = String.Concat( "From ViewModel = ", fromViewModel?.GetType().Name ?? String.Empty, "; Object data = ", data?.ToString() ?? String.Empty );
        return Task.CompletedTask;
    }
}
+2 −1
Original line number Diff line number Diff line
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media.Animation;
@@ -597,7 +599,6 @@ public partial class NavigationFrame : ContentControl
        fadeOut.Completed += handlerFadeOutCompleted;

        this.CurrentView.BeginAnimation( UIElement.OpacityProperty, fadeOut );
        this.CurrentView.BeginAnimation( UIElement.OpacityProperty, null );
    }

    #endregion Fade
+4 −2
Original line number Diff line number Diff line
namespace Common.UI.Interfaces.Navigation;
using System.Threading.Tasks;

namespace Common.UI.Interfaces.Navigation;
/// <summary> Interface for ViewModels, which needs to be aware of navigation.
/// </summary>
public interface INavigationAwareViewModel
@@ -11,5 +13,5 @@ public interface INavigationAwareViewModel
    /// </summary>
    /// <param name="fromViewModel"> The left ViewModel instance. </param>
    /// <param name="data"> The optional data, which is passed from navigator instance. </param>
    void Enter( object? fromViewModel, object? data = null );
    Task Enter( object? fromViewModel, object? data = null );
}
+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public static class CUIFilter
                    yield return typedChild;
                }

                foreach ( T childOfChild in FindAllVisualChildren<T>( child ) )
                foreach ( T childOfChild in FindAllVisualChildren<T>( child, name ) )
                {
                    yield return childOfChild;
                }
+2 −0
Original line number Diff line number Diff line
@@ -509,6 +509,8 @@ public partial class IO

        cellStyle.Alignment = cellFormatting.HorizontalAlignment;
        cellStyle.VerticalAlignment = cellFormatting.VerticalAlignment;

        cellStyle.WrapText = true;
    }

    /// <summary> Sets the font parameters.