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
93b03b2e
Commit
93b03b2e
authored
9 years ago
by
Craig Watson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hide eraser/marker preview circles when mouse enters palettes, in board mode
parent
17461abd
master
bugfix
1.5.4z3
1.5.4z2
1.5.4z
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
0 deletions
+6
-0
UBDesktopAnnotationController.cpp
src/desktop/UBDesktopAnnotationController.cpp
+2
-0
UBDockPalette.cpp
src/gui/UBDockPalette.cpp
+1
-0
UBDockPalette.h
src/gui/UBDockPalette.h
+3
-0
No files found.
src/desktop/UBDesktopAnnotationController.cpp
View file @
93b03b2e
...
...
@@ -126,6 +126,8 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent, UB
connect
(
UBApplication
::
mainWindow
->
actionSelector
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
onToolClicked
()));
connect
(
mDesktopPalette
,
SIGNAL
(
maximized
()),
this
,
SLOT
(
onDesktopPaletteMaximized
()));
connect
(
mDesktopPalette
,
SIGNAL
(
minimizeStart
(
eMinimizedLocation
)),
this
,
SLOT
(
onDesktopPaletteMinimize
()));
connect
(
mDesktopPalette
,
SIGNAL
(
mouseEntered
()),
mTransparentDrawingScene
,
SLOT
(
hideTool
()));
connect
(
mRightPalette
,
SIGNAL
(
mouseEntered
()),
mTransparentDrawingScene
,
SLOT
(
hideTool
()));
connect
(
mTransparentDrawingView
,
SIGNAL
(
resized
(
QResizeEvent
*
)),
this
,
SLOT
(
onTransparentWidgetResized
()));
...
...
This diff is collapsed.
Click to expand it.
src/gui/UBDockPalette.cpp
View file @
93b03b2e
...
...
@@ -197,6 +197,7 @@ void UBDockPalette::enterEvent(QEvent *event)
Q_UNUSED
(
event
);
// We want to set the cursor as an arrow everytime it enters the palette
setCursor
(
Qt
::
ArrowCursor
);
emit
mouseEntered
();
}
/**
...
...
This diff is collapsed.
Click to expand it.
src/gui/UBDockPalette.h
View file @
93b03b2e
...
...
@@ -150,6 +150,9 @@ public slots:
void
onAllDownloadsFinished
();
virtual
void
onDocumentSet
(
UBDocumentProxy
*
documentProxy
);
signals
:
void
mouseEntered
();
protected
:
virtual
int
border
();
virtual
int
radius
();
...
...
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