Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-client-uwp
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-client-uwp
Commits
bd823804
Commit
bd823804
authored
8 years ago
by
Nicolas Jager
Browse files
Options
Downloads
Patches
Plain Diff
fix : call button sometime appears when it should not
Change-Id: Id7f9c26b0f0ad062013ddebf16ce964f569e9a14 Tuleap: #1252
parent
2e4c23fd
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
SmartPanel.xaml
+1
-1
1 addition, 1 deletion
SmartPanel.xaml
SmartPanel.xaml.cpp
+24
-5
24 additions, 5 deletions
SmartPanel.xaml.cpp
SmartPanel.xaml.h
+2
-0
2 additions, 0 deletions
SmartPanel.xaml.h
with
27 additions
and
6 deletions
SmartPanel.xaml
+
1
−
1
View file @
bd823804
...
@@ -223,7 +223,7 @@
...
@@ -223,7 +223,7 @@
<!-- template for smartpanelitems. -->
<!-- template for smartpanelitems. -->
<DataTemplate x:Key="SmartPanelItemsTemplate"
<DataTemplate x:Key="SmartPanelItemsTemplate"
x:DataType="controls:SmartPanelItem">
x:DataType="controls:SmartPanelItem">
<Grid PointerEntered="Grid_PointerEntered" PointerExited="Grid_PointerExited">
<Grid PointerEntered="Grid_PointerEntered" PointerExited="Grid_PointerExited"
PointerMoved="Grid_PointerMoved"
>
<Grid.RowDefinitions>
<Grid.RowDefinitions>
<!-- row definition for the contact. -->
<!-- row definition for the contact. -->
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
...
...
This diff is collapsed.
Click to expand it.
SmartPanel.xaml.cpp
+
24
−
5
View file @
bd823804
...
@@ -426,20 +426,21 @@ void RingClientUWP::Views::SmartPanel::_cancelCallBtn__Click(Platform::Object^ s
...
@@ -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
)
void
RingClientUWP
::
Views
::
SmartPanel
::
Grid_PointerEntered
(
Platform
::
Object
^
sender
,
Windows
::
UI
::
Xaml
::
Input
::
PointerRoutedEventArgs
^
e
)
{
{
auto
grid
=
dynamic_cast
<
Grid
^>
(
sender
);
auto
grid
=
dynamic_cast
<
Grid
^>
(
sender
);
auto
listBoxItem
=
dynamic_cast
<
ListBoxItem
^>
(
sender
);
auto
item
=
dynamic_cast
<
SmartPanelItem
^>
(
grid
->
DataContext
);
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
;
item
->
_hovered
=
Windows
::
UI
::
Xaml
::
Visibility
::
Visible
;
}
}
void
RingClientUWP
::
Views
::
SmartPanel
::
Grid_PointerExited
(
Platform
::
Object
^
sender
,
Windows
::
UI
::
Xaml
::
Input
::
PointerRoutedEventArgs
^
e
)
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
grid
=
dynamic_cast
<
Grid
^>
(
sender
);
auto
item
=
dynamic_cast
<
SmartPanelItem
^>
(
grid
->
DataContext
);
auto
item
=
dynamic_cast
<
SmartPanelItem
^>
(
grid
->
DataContext
);
for
each
(
auto
it
in
SmartPanelItemsViewModel
::
instance
->
itemsList
)
item
->
_hovered
=
Windows
::
UI
::
Xaml
::
Visibility
::
Collapsed
;
item
->
_hovered
=
Windows
::
UI
::
Xaml
::
Visibility
::
Collapsed
;
}
}
...
@@ -924,3 +925,21 @@ void RingClientUWP::Views::SmartPanel::_selectedAccountAvatarContainer__PointerE
...
@@ -924,3 +925,21 @@ void RingClientUWP::Views::SmartPanel::_selectedAccountAvatarContainer__PointerE
_photoboothIcon_
->
Visibility
=
Windows
::
UI
::
Xaml
::
Visibility
::
Collapsed
;
_photoboothIcon_
->
Visibility
=
Windows
::
UI
::
Xaml
::
Visibility
::
Collapsed
;
_shaderPhotoboothIcon_
->
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
;
}
This diff is collapsed.
Click to expand it.
SmartPanel.xaml.h
+
2
−
0
View file @
bd823804
...
@@ -136,6 +136,8 @@ private:
...
@@ -136,6 +136,8 @@ private:
void
_selectedAccountAvatarContainer__PointerEntered
(
Platform
::
Object
^
sender
,
Windows
::
UI
::
Xaml
::
Input
::
PointerRoutedEventArgs
^
e
);
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__PointerReleased
(
Platform
::
Object
^
sender
,
Windows
::
UI
::
Xaml
::
Input
::
PointerRoutedEventArgs
^
e
);
void
_selectedAccountAvatarContainer__PointerExited
(
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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment