Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
J
jami-client-gnome
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
155
Issues
155
List
Boards
Labels
Service Desk
Milestones
Iterations
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
savoirfairelinux
jami-client-gnome
Commits
e173b49c
Commit
e173b49c
authored
May 02, 2019
by
Sébastien Blin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
callview: fix show chat view button status
Change-Id: I813dfc383830ef3066db82456b1556b81f8f77a0
parent
53c8197b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
23 deletions
+14
-23
src/currentcallview.cpp
src/currentcallview.cpp
+9
-23
src/currentcallview.h
src/currentcallview.h
+1
-0
src/ringmainwindow.cpp
src/ringmainwindow.cpp
+4
-0
No files found.
src/currentcallview.cpp
View file @
e173b49c
...
...
@@ -214,7 +214,6 @@ public:
QMetaObject
::
Connection
state_change_connection
;
QMetaObject
::
Connection
renderer_connection
;
QMetaObject
::
Connection
new_message_connection
;
QMetaObject
::
Connection
smartinfo_refresh_connection
;
// for clutter animations and to know when to fade in/out the overlays
...
...
@@ -279,15 +278,6 @@ set_call_quality(CurrentCallView* view, bool auto_quality_on, double desired_qua
}
}
static
void
on_new_chat_interactions
(
CurrentCallView
*
view
)
{
g_return_if_fail
(
IS_CURRENT_CALL_VIEW
(
view
));
auto
*
priv
=
CURRENT_CALL_VIEW_GET_PRIVATE
(
view
);
gtk_toggle_button_set_active
(
GTK_TOGGLE_BUTTON
(
priv
->
togglebutton_chat
),
TRUE
);
}
static
void
set_record_animation
(
CurrentCallViewPrivate
*
priv
)
{
...
...
@@ -674,7 +664,6 @@ CppImpl::~CppImpl()
QObject
::
disconnect
(
state_change_connection
);
QObject
::
disconnect
(
renderer_connection
);
QObject
::
disconnect
(
smartinfo_refresh_connection
);
QObject
::
disconnect
(
new_message_connection
);
g_clear_object
(
&
widgets
->
settings
);
g_source_remove
(
timer_fade
);
...
...
@@ -843,16 +832,6 @@ CppImpl::setCallInfo()
}
});
new_message_connection
=
QObject
::
connect
(
&*
(
*
accountInfo
)
->
conversationModel
,
&
lrc
::
api
::
ConversationModel
::
newInteraction
,
[
this
]
(
const
std
::
string
&
uid
,
uint64_t
msgId
,
lrc
::
api
::
interaction
::
Info
msg
)
{
Q_UNUSED
(
uid
)
Q_UNUSED
(
msgId
)
Q_UNUSED
(
msg
)
gtk_toggle_button_set_active
(
GTK_TOGGLE_BUTTON
(
widgets
->
togglebutton_chat
),
TRUE
);
});
// catch double click to make full screen
g_signal_connect
(
widgets
->
video_widget
,
"button-press-event"
,
G_CALLBACK
(
on_button_press_in_video_event
),
self
);
...
...
@@ -870,8 +849,6 @@ CppImpl::setCallInfo()
*
accountInfo
,
conversation
);
gtk_container_add
(
GTK_CONTAINER
(
widgets
->
frame_chat
),
widgets
->
chat_view
);
g_signal_connect_swapped
(
widgets
->
chat_view
,
"new-interactions-displayed"
,
G_CALLBACK
(
on_new_chat_interactions
),
self
);
chat_view_set_header_visible
(
CHAT_VIEW
(
widgets
->
chat_view
),
FALSE
);
}
...
...
@@ -1219,6 +1196,15 @@ current_call_view_get_chat_view(CurrentCallView *self)
return
priv
->
chat_view
;
}
void
current_call_view_show_chat
(
CurrentCallView
*
view
)
{
g_return_if_fail
(
IS_CURRENT_CALL_VIEW
(
view
));
auto
*
priv
=
CURRENT_CALL_VIEW_GET_PRIVATE
(
view
);
gtk_toggle_button_set_active
(
GTK_TOGGLE_BUTTON
(
priv
->
togglebutton_chat
),
TRUE
);
}
//==============================================================================
static
void
...
...
src/currentcallview.h
View file @
e173b49c
...
...
@@ -57,5 +57,6 @@ GtkWidget *current_call_view_new (WebKitChatContainer* view,
lrc
::
api
::
AVModel
&
avModel
);
lrc
::
api
::
conversation
::
Info
current_call_view_get_conversation
(
CurrentCallView
*
);
GtkWidget
*
current_call_view_get_chat_view
(
CurrentCallView
*
);
void
current_call_view_show_chat
(
CurrentCallView
*
);
G_END_DECLS
src/ringmainwindow.cpp
View file @
e173b49c
...
...
@@ -2196,6 +2196,10 @@ CppImpl::slotNewInteraction(const std::string& accountId, const std::string& con
uint64_t
,
const
lrc
::
api
::
interaction
::
Info
&
interaction
)
{
if
(
chatViewConversation_
&&
chatViewConversation_
->
uid
==
conversation
)
{
auto
*
old_view
=
gtk_bin_get_child
(
GTK_BIN
(
widgets
->
frame_call
));
if
(
IS_CURRENT_CALL_VIEW
(
old_view
))
{
current_call_view_show_chat
(
CURRENT_CALL_VIEW
(
old_view
));
}
if
(
gtk_window_is_active
(
GTK_WINDOW
(
self
)))
{
return
;
}
...
...
Write
Preview
Markdown
is supported
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