Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-client-windows
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab 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-windows
Commits
45d83bde
Commit
45d83bde
authored
Feb 5, 2019
by
Andreas Traczyk
Browse files
Options
Downloads
Patches
Plain Diff
messageview: homogenize fonts for invites
Change-Id: I01e72deee52ad061ba011580c3e4daff576a1f81
parent
f8052f6c
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
conversationitemdelegate.cpp
+5
-2
5 additions, 2 deletions
conversationitemdelegate.cpp
web/chatview.css
+27
-25
27 additions, 25 deletions
web/chatview.css
web/chatview.js
+1
-1
1 addition, 1 deletion
web/chatview.js
with
33 additions
and
28 deletions
conversationitemdelegate.cpp
+
5
−
2
View file @
45d83bde
...
...
@@ -296,20 +296,23 @@ ConversationItemDelegate::paintRingInviteConversationItem(QPainter* painter,
const
QModelIndex
&
index
)
const
{
QFont
font
(
painter
->
font
());
font
.
setPointSize
(
fontSize_
);
QPen
pen
(
painter
->
pen
());
painter
->
setPen
(
pen
);
auto
leftMargin
=
dx_
+
sizeImage_
+
dx_
;
auto
rightMargin
=
dx_
;
if
(
option
.
state
&
QStyle
::
State_MouseOver
)
{
auto
scalingRatio
=
MainWindow
::
instance
().
getCurrentScalingRatio
();
font
.
setPointSize
(
scalingRatio
>
1.0
?
fontSize_
-
2
:
fontSize_
);
if
(
option
.
state
&
QStyle
::
State_MouseOver
)
{
if
(
scalingRatio
>
1.0
)
{
rightMargin
=
infoTextWidth_
+
12
-
dx_
*
2
;
}
else
{
rightMargin
=
infoTextWidth_
-
dx_
*
2
;
}
}
auto
topMargin
=
4
;
auto
bottomMargin
=
8
;
...
...
This diff is collapsed.
Click to expand it.
web/chatview.css
+
27
−
25
View file @
45d83bde
...
...
@@ -118,7 +118,7 @@ body {
display
:
flex
;
cursor
:
pointer
;
align-self
:
center
;
border-radius
:
9
px
;
border-radius
:
16
px
;
}
.nav-button.deactivated
{
...
...
@@ -128,7 +128,7 @@ body {
padding
:
2px
;
align-self
:
center
;
display
:
flex
;
border-radius
:
9
px
;
border-radius
:
16
px
;
cursor
:
auto
;
}
...
...
@@ -203,7 +203,6 @@ body {
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
/* enable selection (it is globally disabled in the body) */
-webkit-user-select
:
auto
;
}
...
...
@@ -235,14 +234,17 @@ body {
#invitation
#text
{
text-align
:
center
;
font-size
:
0.8em
;
font
:
11pt
sans-serif
;
/* enable selection (it is globally disabled in the body) */
-webkit-user-select
:
auto
;
}
/** Messaging bar */
#invite_contact_name
{
font-weight
:
500
;
}
/** Messaging bar */
#sendMessage
{
background-color
:
var
(
--bg-color
);
display
:
flex
;
...
...
This diff is collapsed.
Click to expand it.
web/chatview.js
+
1
−
1
View file @
45d83bde
...
...
@@ -162,7 +162,7 @@ function showInvitation(contactAlias, contactId) {
inviteImage
.
classList
.
add
(
`invite_sender_image_
${
contactId
}
`
);
}
hasInvitation
=
true
invitationText
.
innerHTML
=
"
<
b
>
"
+
contactAlias
+
"
is not in your contacts<
/b><
br/>
"
invitationText
.
innerHTML
=
"
<
span id='invite_contact_name'
>
"
+
contactAlias
+
"
</span>
is not in your contacts<br/>
"
+
"
Note: you can automatically accept this invitation by sending a message.
"
invitation
.
style
.
visibility
=
"
visible
"
}
...
...
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