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
80a19c1d
Commit
80a19c1d
authored
Dec 01, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/modules/Common/Image/RoundedImage): supports color mask
parent
92389c1c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
4 deletions
+16
-4
resources.qrc
tests/resources.qrc
+2
-0
App.cpp
tests/src/app/App.cpp
+4
-0
RoundedImage.qml
tests/ui/modules/Common/Image/RoundedImage.qml
+9
-3
CaterpillarAnimationStyle.qml
...es/Common/Styles/Animations/CaterpillarAnimationStyle.qml
+1
-1
No files found.
tests/resources.qrc
View file @
80a19c1d
...
@@ -4,9 +4,11 @@
...
@@ -4,9 +4,11 @@
<file>
assets/images/attachment_normal.svg
</file>
<file>
assets/images/attachment_normal.svg
</file>
<file>
assets/images/attachment_pressed.svg
</file>
<file>
assets/images/attachment_pressed.svg
</file>
<file>
assets/images/auto_answer.svg
</file>
<file>
assets/images/auto_answer.svg
</file>
<file>
assets/images/a-v-a-t-a-r-120120@3x.png
</file>
<file>
assets/images/call_hovered.svg
</file>
<file>
assets/images/call_hovered.svg
</file>
<file>
assets/images/call_normal.svg
</file>
<file>
assets/images/call_normal.svg
</file>
<file>
assets/images/call_pressed.svg
</file>
<file>
assets/images/call_pressed.svg
</file>
<file>
assets/images/cat.jpg
</file>
<file>
assets/images/chat_error.svg
</file>
<file>
assets/images/chat_error.svg
</file>
<file>
assets/images/chat_hovered.svg
</file>
<file>
assets/images/chat_hovered.svg
</file>
<file>
assets/images/chat_normal.svg
</file>
<file>
assets/images/chat_normal.svg
</file>
...
...
tests/src/app/App.cpp
View file @
80a19c1d
...
@@ -99,6 +99,10 @@ void App::registerTypes () {
...
@@ -99,6 +99,10 @@ void App::registerTypes () {
);
);
// Register models.
// Register models.
qmlRegisterUncreatableType
<
ContactModel
>
(
"Linphone"
,
1
,
0
,
"ContactModel"
,
"ContactModel is uncreatable"
);
ContactsListProxyModel
::
initContactsListModel
(
new
ContactsListModel
());
ContactsListProxyModel
::
initContactsListModel
(
new
ContactsListModel
());
qmlRegisterType
<
ContactsListProxyModel
>
(
"Linphone"
,
1
,
0
,
"ContactsListProxyModel"
);
qmlRegisterType
<
ContactsListProxyModel
>
(
"Linphone"
,
1
,
0
,
"ContactsListProxyModel"
);
...
...
tests/ui/modules/Common/Image/RoundedImage.qml
View file @
80a19c1d
...
@@ -4,6 +4,8 @@ import QtQuick 2.7
...
@@ -4,6 +4,8 @@ import QtQuick 2.7
Item
{
Item
{
property
alias
source
:
image
.
source
property
alias
source
:
image
.
source
property
color
colorMask
:
'
#00000000
'
// vec4(0.812, 0.843, 0.866, 1.0) 0.9
Item
{
Item
{
id
:
imageContainer
id
:
imageContainer
...
@@ -26,17 +28,21 @@ Item {
...
@@ -26,17 +28,21 @@ Item {
layer
{
layer
{
effect
:
ShaderEffect
{
effect
:
ShaderEffect
{
property
var
image
:
imageContainer
property
var
image
:
imageContainer
property
var
color
:
colorMask
fragmentShader
:
'
fragmentShader
:
'
uniform lowp sampler2D image;
uniform lowp sampler2D image;
uniform lowp sampler2D mask;
uniform lowp sampler2D mask;
uniform lowp
float qt_Opacity
;
uniform lowp
vec4 color
;
uniform lowp float qt_Opacity;
varying highp vec2 qt_TexCoord0;
varying highp vec2 qt_TexCoord0;
void main () {
void main () {
gl_FragColor = texture2D(image, qt_TexCoord0) *
vec4 tex = texture2D(image, qt_TexCoord0);
texture2D(mask, qt_TexCoord0).a *
gl_FragColor = mix(tex, vec4(color.rgb, 1.0), color.a) *
texture2D(mask, qt_TexCoord0) *
qt_Opacity;
qt_Opacity;
}
}
'
'
...
...
tests/ui/modules/Common/Styles/Animations/CaterpillarAnimationStyle.qml
View file @
80a19c1d
...
@@ -15,7 +15,7 @@ QtObject {
...
@@ -15,7 +15,7 @@ QtObject {
}
}
property
QtObject
sphere
:
QtObject
{
property
QtObject
sphere
:
QtObject
{
property
color
color
:
Colors
.
r
property
color
color
:
Colors
.
x
property
int
size
:
10
property
int
size
:
10
}
}
}
}
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