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
4c1e1ee9
Commit
4c1e1ee9
authored
Aug 20, 2012
by
Ilia Ryabokon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Sankore-655 little fixes
parent
bcdd655b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
UBBoardPaletteManager.cpp
src/board/UBBoardPaletteManager.cpp
+6
-0
UBFeaturesWidget.cpp
src/gui/UBFeaturesWidget.cpp
+2
-1
gui.pri
src/gui/gui.pri
+0
-2
No files found.
src/board/UBBoardPaletteManager.cpp
View file @
4c1e1ee9
...
...
@@ -704,6 +704,7 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
mAddItemPalette
->
setParent
((
QWidget
*
)
UBApplication
::
applicationController
->
uninotesController
()
->
drawingView
());
mLeftPalette
->
assignParent
((
QWidget
*
)
UBApplication
::
applicationController
->
uninotesController
()
->
drawingView
());
mRightPalette
->
assignParent
((
QWidget
*
)
UBApplication
::
applicationController
->
uninotesController
()
->
drawingView
());
mStylusPalette
->
raise
();
// Maybe threre is a reason to keep that functions but with them right palette in desktop mode is not interactable
// mRightPalette->lower();
// mLeftPalette->lower();
...
...
@@ -724,7 +725,12 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
mKeyboardPalette
->
show
();
}
else
// In linux keyboard in desktop mode have to allways be with null parent
#ifdef Q_WS_X11
mKeyboardPalette
->
setParent
(
0
);
#else
mKeyboardPalette
->
setParent
((
QWidget
*
)
UBApplication
::
applicationController
->
uninotesController
()
->
drawingView
());
#endif //Q_WS_X11
#ifdef Q_WS_MAC
mKeyboardPalette
->
setWindowFlags
(
Qt
::
Dialog
|
Qt
::
Popup
|
Qt
::
FramelessWindowHint
);
#endif
...
...
src/gui/UBFeaturesWidget.cpp
View file @
4c1e1ee9
...
...
@@ -1395,6 +1395,7 @@ QString UBFeaturesItemDelegate::displayText ( const QVariant & value, const QLoc
Q_UNUSED
(
locale
)
QString
text
=
value
.
toString
();
text
=
text
.
replace
(
".wgt"
,
""
);
if
(
listView
)
{
const
QFontMetrics
fm
=
listView
->
fontMetrics
();
...
...
@@ -1423,7 +1424,7 @@ void UBFeaturesPathItemDelegate::paint( QPainter *painter, const QStyleOptionVie
QRect
rect
=
option
.
rect
;
if
(
!
feature
.
getFullPath
().
isEmpty
()
)
{
painter
->
drawPixmap
(
rect
.
left
()
-
10
,
rect
.
center
().
y
()
-
5
,
*
arrowPixmap
);
painter
->
drawPixmap
(
rect
.
left
()
-
10
,
rect
.
center
().
y
()
-
5
,
*
arrowPixmap
);
}
painter
->
drawImage
(
rect
.
left
()
+
5
,
rect
.
center
().
y
()
-
5
,
feature
.
getThumbnail
().
scaledToHeight
(
30
,
Qt
::
SmoothTransformation
)
);
}
...
...
src/gui/gui.pri
View file @
4c1e1ee9
...
...
@@ -35,10 +35,8 @@ HEADERS += src/gui/UBThumbnailView.h \
src/gui/UBLeftPalette.h \
src/gui/UBRightPalette.h \
src/gui/UBPageNavigationWidget.h \
src/gui/UBLibWidget.h \
src/gui/UBMagnifer.h \
src/gui/UBCachePropertiesWidget.h \
src/gui/UBLibWebView.h \
src/gui/UBDownloadWidget.h \
src/gui/UBDockDownloadWidget.h \
src/gui/UBFeaturesWidget.h \
...
...
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