Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-client-uwp
Commits
bd823804
Commit
bd823804
authored
Oct 26, 2016
by
Nicolas Jager
Browse files
fix : call button sometime appears when it should not
Change-Id: Id7f9c26b0f0ad062013ddebf16ce964f569e9a14 Tuleap: #1252
parent
2e4c23fd
Changes
3
Show whitespace changes
Inline
Side-by-side
SmartPanel.xaml
View file @
bd823804
...
...
@@ -223,7 +223,7 @@
<!-- template for smartpanelitems. -->
<DataTemplate x:Key="SmartPanelItemsTemplate"
x:DataType="controls:SmartPanelItem">
<Grid PointerEntered="Grid_PointerEntered" PointerExited="Grid_PointerExited">
<Grid PointerEntered="Grid_PointerEntered" PointerExited="Grid_PointerExited"
PointerMoved="Grid_PointerMoved"
>
<Grid.RowDefinitions>
<!-- row definition for the contact. -->
<RowDefinition Height="auto"/>
...
...
SmartPanel.xaml.cpp
View file @
bd823804
...
...
@@ -426,20 +426,21 @@ void RingClientUWP::Views::SmartPanel::_cancelCallBtn__Click(Platform::Object^ s
void
RingClientUWP
::
Views
::
SmartPanel
::
Grid_PointerEntered
(
Platform
::
Object
^
sender
,
Windows
::
UI
::
Xaml
::
Input
::
PointerRoutedEventArgs
^
e
)
{
auto
grid
=
dynamic_cast
<
Grid
^>
(
sender
);
auto
listBoxItem
=
dynamic_cast
<
ListBoxItem
^>
(
sender
);
auto
item
=
dynamic_cast
<
SmartPanelItem
^>
(
grid
->
DataContext
);
if
(
item
->
_callId
->
IsEmpty
())
for
(
auto
it
:
SmartPanelItemsViewModel
::
instance
->
itemsList
)
it
->
_hovered
=
Windows
::
UI
::
Xaml
::
Visibility
::
Collapsed
;
item
->
_hovered
=
Windows
::
UI
::
Xaml
::
Visibility
::
Visible
;
}
void
RingClientUWP
::
Views
::
SmartPanel
::
Grid_PointerExited
(
Platform
::
Object
^
sender
,
Windows
::
UI
::
Xaml
::
Input
::
PointerRoutedEventArgs
^
e
)
{
auto
listBoxItem
=
dynamic_cast
<
ListBoxItem
^>
(
sender
);
auto
grid
=
dynamic_cast
<
Grid
^>
(
sender
);
auto
item
=
dynamic_cast
<
SmartPanelItem
^>
(
grid
->
DataContext
);
for
each
(
auto
it
in
SmartPanelItemsViewModel
::
instance
->
itemsList
)
item
->
_hovered
=
Windows
::
UI
::
Xaml
::
Visibility
::
Collapsed
;
}
...
...
@@ -924,3 +925,21 @@ void RingClientUWP::Views::SmartPanel::_selectedAccountAvatarContainer__PointerE
_photoboothIcon_
->
Visibility
=
Windows
::
UI
::
Xaml
::
Visibility
::
Collapsed
;
_shaderPhotoboothIcon_
->
Visibility
=
Windows
::
UI
::
Xaml
::
Visibility
::
Collapsed
;
}
void
RingClientUWP
::
Views
::
SmartPanel
::
_smartList__PointerExited
(
Platform
::
Object
^
sender
,
Windows
::
UI
::
Xaml
::
Input
::
PointerRoutedEventArgs
^
e
)
{
}
void
RingClientUWP
::
Views
::
SmartPanel
::
Grid_PointerMoved
(
Platform
::
Object
^
sender
,
Windows
::
UI
::
Xaml
::
Input
::
PointerRoutedEventArgs
^
e
)
{
auto
grid
=
dynamic_cast
<
Grid
^>
(
sender
);
auto
item
=
dynamic_cast
<
SmartPanelItem
^>
(
grid
->
DataContext
);
for
(
auto
it
:
SmartPanelItemsViewModel
::
instance
->
itemsList
)
it
->
_hovered
=
Windows
::
UI
::
Xaml
::
Visibility
::
Collapsed
;
item
->
_hovered
=
Windows
::
UI
::
Xaml
::
Visibility
::
Visible
;
}
SmartPanel.xaml.h
View file @
bd823804
...
...
@@ -136,6 +136,8 @@ private:
void
_selectedAccountAvatarContainer__PointerEntered
(
Platform
::
Object
^
sender
,
Windows
::
UI
::
Xaml
::
Input
::
PointerRoutedEventArgs
^
e
);
void
_selectedAccountAvatarContainer__PointerReleased
(
Platform
::
Object
^
sender
,
Windows
::
UI
::
Xaml
::
Input
::
PointerRoutedEventArgs
^
e
);
void
_selectedAccountAvatarContainer__PointerExited
(
Platform
::
Object
^
sender
,
Windows
::
UI
::
Xaml
::
Input
::
PointerRoutedEventArgs
^
e
);
void
_smartList__PointerExited
(
Platform
::
Object
^
sender
,
Windows
::
UI
::
Xaml
::
Input
::
PointerRoutedEventArgs
^
e
);
void
Grid_PointerMoved
(
Platform
::
Object
^
sender
,
Windows
::
UI
::
Xaml
::
Input
::
PointerRoutedEventArgs
^
e
);
};
}
}
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment