Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nheko
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nheko Reborn
nheko
Commits
1705273b
Commit
1705273b
authored
7 years ago
by
Konstantinos Sideris
Browse files
Options
Downloads
Patches
Plain Diff
Fix font size inconsistencies
parent
94b28270
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/Config.h
+5
-1
5 additions, 1 deletion
include/Config.h
src/RoomInfoListItem.cc
+1
-1
1 addition, 1 deletion
src/RoomInfoListItem.cc
src/dialogs/CreateRoom.cc
+8
-6
8 additions, 6 deletions
src/dialogs/CreateRoom.cc
with
14 additions
and
8 deletions
include/Config.h
+
5
−
1
View file @
1705273b
...
@@ -12,6 +12,10 @@ static constexpr int emojiSize = 14;
...
@@ -12,6 +12,10 @@ static constexpr int emojiSize = 14;
static
constexpr
int
headerFontSize
=
21
;
static
constexpr
int
headerFontSize
=
21
;
static
constexpr
int
typingNotificationFontSize
=
11
;
static
constexpr
int
typingNotificationFontSize
=
11
;
namespace
dialogs
{
static
constexpr
int
labelSize
=
15
;
}
// Window geometry.
// Window geometry.
namespace
window
{
namespace
window
{
static
constexpr
int
height
=
600
;
static
constexpr
int
height
=
600
;
...
@@ -39,7 +43,7 @@ static constexpr int cornerRadius = 3;
...
@@ -39,7 +43,7 @@ static constexpr int cornerRadius = 3;
// RoomList specific.
// RoomList specific.
namespace
roomlist
{
namespace
roomlist
{
namespace
fonts
{
namespace
fonts
{
static
constexpr
int
heading
=
1
5
;
static
constexpr
int
heading
=
1
4
;
static
constexpr
int
badge
=
10
;
static
constexpr
int
badge
=
10
;
static
constexpr
int
bubble
=
20
;
static
constexpr
int
bubble
=
20
;
}
// namespace fonts
}
// namespace fonts
...
...
This diff is collapsed.
Click to expand it.
src/RoomInfoListItem.cc
+
1
−
1
View file @
1705273b
...
@@ -148,7 +148,7 @@ RoomInfoListItem::paintEvent(QPaintEvent *event)
...
@@ -148,7 +148,7 @@ RoomInfoListItem::paintEvent(QPaintEvent *event)
if
(
width
()
>
ui
::
sidebar
::
SmallSize
)
{
if
(
width
()
>
ui
::
sidebar
::
SmallSize
)
{
font
.
setPixelSize
(
conf
::
roomlist
::
fonts
::
heading
);
font
.
setPixelSize
(
conf
::
roomlist
::
fonts
::
heading
);
font
.
setWeight
(
6
8
);
font
.
setWeight
(
6
0
);
p
.
setFont
(
font
);
p
.
setFont
(
font
);
p
.
setPen
(
titlePen
);
p
.
setPen
(
titlePen
);
...
...
This diff is collapsed.
Click to expand it.
src/dialogs/CreateRoom.cc
+
8
−
6
View file @
1705273b
...
@@ -54,16 +54,18 @@ CreateRoom::CreateRoom(QWidget *parent)
...
@@ -54,16 +54,18 @@ CreateRoom::CreateRoom(QWidget *parent)
auto
presetLayout
=
new
QHBoxLayout
;
auto
presetLayout
=
new
QHBoxLayout
;
presetLayout
->
setContentsMargins
(
0
,
10
,
0
,
10
);
presetLayout
->
setContentsMargins
(
0
,
10
,
0
,
10
);
auto
visibilityLabel
=
new
QLabel
(
tr
(
"Room visibility"
),
this
);
auto
visibilityLabel
=
new
QLabel
(
tr
(
"Room Visibility"
),
this
);
visibilityCombo_
=
new
QComboBox
(
this
);
visibilityLabel
->
setStyleSheet
(
QString
(
"font-size: %1px;"
).
arg
(
conf
::
dialogs
::
labelSize
));
visibilityCombo_
=
new
QComboBox
(
this
);
visibilityCombo_
->
addItem
(
"Private"
);
visibilityCombo_
->
addItem
(
"Private"
);
visibilityCombo_
->
addItem
(
"Public"
);
visibilityCombo_
->
addItem
(
"Public"
);
visibilityLayout
->
addWidget
(
visibilityLabel
);
visibilityLayout
->
addWidget
(
visibilityLabel
);
visibilityLayout
->
addWidget
(
visibilityCombo_
,
0
,
Qt
::
AlignBottom
|
Qt
::
AlignRight
);
visibilityLayout
->
addWidget
(
visibilityCombo_
,
0
,
Qt
::
AlignBottom
|
Qt
::
AlignRight
);
auto
presetLabel
=
new
QLabel
(
tr
(
"Room preset"
),
this
);
auto
presetLabel
=
new
QLabel
(
tr
(
"Room Preset"
),
this
);
presetCombo_
=
new
QComboBox
(
this
);
presetLabel
->
setStyleSheet
(
QString
(
"font-size: %1px;"
).
arg
(
conf
::
dialogs
::
labelSize
));
presetCombo_
=
new
QComboBox
(
this
);
presetCombo_
->
addItem
(
"Private Chat"
);
presetCombo_
->
addItem
(
"Private Chat"
);
presetCombo_
->
addItem
(
"Public Chat"
);
presetCombo_
->
addItem
(
"Public Chat"
);
presetCombo_
->
addItem
(
"Trusted Private Chat"
);
presetCombo_
->
addItem
(
"Trusted Private Chat"
);
...
@@ -72,11 +74,11 @@ CreateRoom::CreateRoom(QWidget *parent)
...
@@ -72,11 +74,11 @@ CreateRoom::CreateRoom(QWidget *parent)
presetLayout
->
addWidget
(
presetCombo_
,
0
,
Qt
::
AlignBottom
|
Qt
::
AlignRight
);
presetLayout
->
addWidget
(
presetCombo_
,
0
,
Qt
::
AlignBottom
|
Qt
::
AlignRight
);
auto
directLabel_
=
new
QLabel
(
tr
(
"Direct Chat"
),
this
);
auto
directLabel_
=
new
QLabel
(
tr
(
"Direct Chat"
),
this
);
directToggle_
=
new
Toggle
(
this
);
directLabel_
->
setStyleSheet
(
QString
(
"font-size: %1px;"
).
arg
(
conf
::
dialogs
::
labelSize
));
directToggle_
=
new
Toggle
(
this
);
directToggle_
->
setActiveColor
(
QColor
(
"#38A3D8"
));
directToggle_
->
setActiveColor
(
QColor
(
"#38A3D8"
));
directToggle_
->
setInactiveColor
(
QColor
(
"gray"
));
directToggle_
->
setInactiveColor
(
QColor
(
"gray"
));
directToggle_
->
setState
(
true
);
directToggle_
->
setState
(
true
);
directLabel_
->
setStyleSheet
(
"font-size: 15px;"
);
auto
directLayout
=
new
QHBoxLayout
;
auto
directLayout
=
new
QHBoxLayout
;
directLayout
->
setContentsMargins
(
0
,
10
,
0
,
10
);
directLayout
->
setContentsMargins
(
0
,
10
,
0
,
10
);
...
...
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