- The subpanel icon is overlapped when the subpanel is changed to the move mode.
- After moving subpanel item, it can't be moved focus using remote control direction key.
Change-Id: Iaa60181abea9b5a1b697318ec07e63a5a41f4acc
Signed-off-by: Hyerim Kim <rimi.kim@samsung.com>
popup = null;
if (!IsButtonMoving)
{
- PanelButtonState = PanelButtonState.Focused;
+ PanelButtonState = PanelButtonState.Show;
}
};
AppsSubPanel.OnPanelShowing();
SettingsSubPanel.OnPanelHiding();
- PropertyChanged += MainPage_PropertyChanged;
+ PropertyChanged += MainPagePropertyChanged;
App.SetHomeKeyListener((e, arg) =>
{
AppsSubPanel.ItemSourceChanged += (s, e) =>
{
- if (CurrentState != AppState.HomeMove)
- {
- InitializeAppsSubPanelButtonFocusChain();
- }
+ InitializeAppsSubPanelButtonFocusChain();
};
InitializeMainPanelButtonFocusChain();
/// </summary>
/// <param name="sender">The source of event</param>
/// <param name="e">The event that is occurred when property is changed</param>
- private void MainPage_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+ private void MainPagePropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
{
if (e.PropertyName.CompareTo("CurrentState") == 0)
{
using TVHome.ViewModels;
using Xamarin.Forms;
using LibTVRefCommonPortable.Utils;
-using System;
namespace TVHome.Views
{
public override void OnOptionMenuShowing()
{
- this.FadeTo(0, 300);
IsVisible = false;
}
- public override void OnOptionMenuHiding()
+ public override void OnOptionMenuHiding(bool isMoveMode = false)
{
- this.FadeTo(1, 300);
+ if (isMoveMode)
+ {
+ return;
+ }
+
IsVisible = true;
}
public override void OnMoveStarting()
{
- IsVisible = false;
}
public override void OnMoveFinishing()
public abstract void OnOptionMenuShowing();
- public abstract void OnOptionMenuHiding();
+ public abstract void OnOptionMenuHiding(bool isMoveMode = false);
public abstract void OnMoveStarting();
switch (previousPanelState)
{
case PanelState.ShowingOption:
- OnOptionMenuHiding();
+ if (PanelState == PanelState.Moving)
+ {
+ OnOptionMenuHiding(true);
+ }
+ else
+ {
+ OnOptionMenuHiding();
+ }
break;
case PanelState.Moving:
OnMoveFinishing();
var bounds = Bounds;
bounds.Height += 300;
bounds.Y -= 300;
- this.LayoutTo(bounds, 0);
+ this.LayoutTo(bounds, 167);
}
- public override void OnOptionMenuHiding()
+ public override void OnOptionMenuHiding(bool isMoveMode = false)
{
DebuggingUtils.Dbg("OnHidingOptiongMenu - SubPanel");
var bounds = Bounds;