Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
21120bd1
Commit
21120bd1
authored
Nov 29, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ui/modules/Linphone/Chat/Chat): parent may be `null` in delegate
parent
ffedd50e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
App.hpp
tests/src/app/App.hpp
+1
-0
Chat.qml
tests/ui/modules/Linphone/Chat/Chat.qml
+2
-3
No files found.
tests/src/app/App.hpp
View file @
21120bd1
...
@@ -18,6 +18,7 @@ class App : public QApplication {
...
@@ -18,6 +18,7 @@ class App : public QApplication {
public:
public:
static
void
init
(
int
&
argc
,
char
**
argv
)
{
static
void
init
(
int
&
argc
,
char
**
argv
)
{
if
(
!
m_instance
)
{
if
(
!
m_instance
)
{
// Instance must be exists before content.
m_instance
=
new
App
(
argc
,
argv
);
m_instance
=
new
App
(
argc
,
argv
);
m_instance
->
initContentApp
();
m_instance
->
initContentApp
();
}
}
...
...
tests/ui/modules/Linphone/Chat/Chat.qml
View file @
21120bd1
...
@@ -90,9 +90,9 @@ ColumnLayout {
...
@@ -90,9 +90,9 @@ ColumnLayout {
}
}
anchors
{
anchors
{
left
:
parent
.
left
left
:
parent
?
parent
.
left
:
undefined
leftMargin
:
ChatStyle
.
entry
.
leftMargin
leftMargin
:
ChatStyle
.
entry
.
leftMargin
right
:
parent
.
right
right
:
parent
?
parent
.
right
:
undefined
// Ugly. I admit it, but it exists a problem, without these
// Ugly. I admit it, but it exists a problem, without these
// lines the extra content message is truncated.
// lines the extra content message is truncated.
...
@@ -106,7 +106,6 @@ ColumnLayout {
...
@@ -106,7 +106,6 @@ ColumnLayout {
ChatStyle
.
entry
.
message
.
outgoing
.
sendIconSize
ChatStyle
.
entry
.
message
.
outgoing
.
sendIconSize
}
}
implicitHeight
:
layout
.
height
+
ChatStyle
.
entry
.
bottomMargin
implicitHeight
:
layout
.
height
+
ChatStyle
.
entry
.
bottomMargin
width
:
parent
.
width
// -------------------------------------------------------------
// -------------------------------------------------------------
...
...
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