Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-client-windows
Commits
45d83bde
Commit
45d83bde
authored
Feb 05, 2019
by
Andreas Traczyk
Browse files
messageview: homogenize fonts for invites
Change-Id: I01e72deee52ad061ba011580c3e4daff576a1f81
parent
f8052f6c
Changes
3
Show whitespace changes
Inline
Side-by-side
conversationitemdelegate.cpp
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
;
...
...
web/chatview.css
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
;
}
...
...
@@ -197,16 +197,15 @@ body {
border-bottom
:
var
(
--hairline-thickness
)
solid
var
(
--hairline-color
);
}
#invitation
#invite_header
{
#invitation
#invite_header
{
margin
:
10px
;
list-style
:
none
;
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
/* enable selection (it is globally disabled in the body) */
-webkit-user-select
:
auto
;
}
}
#invitation
.sender_image
{
width
:
50px
;
...
...
@@ -233,16 +232,19 @@ body {
margin-left
:
5px
;
}
#invitation
#text
{
#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
;
}
#invite_contact_name
{
font-weight
:
500
;
}
/** Messaging bar */
#sendMessage
{
background-color
:
var
(
--bg-color
);
display
:
flex
;
...
...
web/chatview.js
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
"
}
...
...
Write
Preview
Supports
Markdown
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