Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenBoard
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
lifo
Nicolas Ollinger
OpenBoard
Commits
54c800e4
Commit
54c800e4
authored
5 years ago
by
Clément Fauconnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
workaround for QFontDialog issue locking current font (
https://bugreports.qt.io/browse/QTBUG-79637
)
parent
937bf5aa
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
UBGraphicsTextItemDelegate.cpp
src/domain/UBGraphicsTextItemDelegate.cpp
+5
-3
No files found.
src/domain/UBGraphicsTextItemDelegate.cpp
View file @
54c800e4
...
...
@@ -280,8 +280,6 @@ void UBGraphicsTextItemDelegate::contentsChanged()
// will remain in the font list.
void
UBGraphicsTextItemDelegate
::
customize
(
QFontDialog
&
fontDialog
)
{
fontDialog
.
setOption
(
QFontDialog
::
DontUseNativeDialog
);
if
(
UBSettings
::
settings
()
->
isDarkBackground
())
{
fontDialog
.
setStyleSheet
(
"background-color: white;"
);
}
...
...
@@ -334,7 +332,11 @@ void UBGraphicsTextItemDelegate::pickFont()
{
if
(
mDelegated
&&
mDelegated
->
scene
()
&&
mDelegated
->
scene
()
->
views
().
size
()
>
0
)
{
QFontDialog
fontDialog
(
delegated
()
->
textCursor
().
charFormat
().
font
(),
static_cast
<
QGraphicsView
*>
(
UBApplication
::
boardController
->
controlView
()));
// https://bugreports.qt.io/browse/QTBUG-79637
QFontDialog
fontDialog
(
static_cast
<
QGraphicsView
*>
(
UBApplication
::
boardController
->
controlView
()));
fontDialog
.
setOption
(
QFontDialog
::
DontUseNativeDialog
);
fontDialog
.
setCurrentFont
(
delegated
()
->
textCursor
().
charFormat
().
font
());
customize
(
fontDialog
);
if
(
fontDialog
.
exec
())
...
...
This diff is collapsed.
Click to expand it.
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