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
a2a729c8
Commit
a2a729c8
authored
11 years ago
by
Didier Clerc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolved a focus issue on the text item
parent
94407ff1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
21 deletions
+1
-21
UBBoardController.cpp
src/board/UBBoardController.cpp
+0
-20
UBBoardController.h
src/board/UBBoardController.h
+0
-1
UBGraphicsScene.cpp
src/domain/UBGraphicsScene.cpp
+1
-0
No files found.
src/board/UBBoardController.cpp
View file @
a2a729c8
...
...
@@ -1522,7 +1522,6 @@ void UBBoardController::setActiveDocumentScene(UBDocumentProxy* pDocumentProxy,
selectionChanged
();
updateBackgroundActionsState
(
mActiveScene
->
isDarkBackground
(),
mActiveScene
->
isCrossedBackground
());
updateBackgroundState
();
if
(
documentChange
)
UBGraphicsTextItem
::
lastUsedTextColor
=
QColor
();
...
...
@@ -1642,8 +1641,6 @@ void UBBoardController::changeBackground(bool isDark, bool isCrossed)
mActiveScene
->
setBackground
(
isDark
,
isCrossed
);
updateBackgroundState
();
emit
backgroundChanged
();
}
}
...
...
@@ -1984,22 +1981,6 @@ void UBBoardController::saveViewState()
}
}
void
UBBoardController
::
updateBackgroundState
()
{
//adjust background style
QString
newBackgroundStyle
;
if
(
mActiveScene
&&
mActiveScene
->
isDarkBackground
())
{
newBackgroundStyle
=
"QWidget {background-color: #0E0E0E}"
;
}
else
{
newBackgroundStyle
=
"QWidget {background-color: #F1F1F1}"
;
}
}
void
UBBoardController
::
stylusToolChanged
(
int
tool
)
{
if
(
UBPlatformUtils
::
hasVirtualKeyboard
()
&&
mPaletteManager
->
mKeyboardPalette
)
...
...
@@ -2012,7 +1993,6 @@ void UBBoardController::stylusToolChanged(int tool)
}
}
updateBackgroundState
();
}
...
...
This diff is collapsed.
Click to expand it.
src/board/UBBoardController.h
View file @
a2a729c8
...
...
@@ -299,7 +299,6 @@ class UBBoardController : public UBDocumentContainer
void
boardViewResized
(
QResizeEvent
*
event
);
void
documentWillBeDeleted
(
UBDocumentProxy
*
pProxy
);
void
updateBackgroundActionsState
(
bool
isDark
,
bool
isCrossed
);
void
updateBackgroundState
();
void
colorPaletteChanged
();
void
libraryDialogClosed
(
int
ret
);
void
lastWindowClosed
();
...
...
This diff is collapsed.
Click to expand it.
src/domain/UBGraphicsScene.cpp
View file @
a2a729c8
...
...
@@ -1712,6 +1712,7 @@ void UBGraphicsScene::deselectAllItems()
{
foreach
(
QGraphicsItem
*
gi
,
selectedItems
())
{
gi
->
clearFocus
();
gi
->
setSelected
(
false
);
// Hide selection frame
if
(
mSelectionFrame
)
{
...
...
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