Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Farid Abdelnour
kdenlive
Commits
59e35b84
Commit
59e35b84
authored
Jan 04, 2016
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix razor cursor sometimes not appearing and not adapting to color theme
CCBUG: 357520
parent
2884e7ae
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
src/timeline/customtrackview.cpp
src/timeline/customtrackview.cpp
+4
-1
src/timeline/timeline.cpp
src/timeline/timeline.cpp
+2
-1
No files found.
src/timeline/customtrackview.cpp
View file @
59e35b84
...
...
@@ -39,6 +39,7 @@
#include "mainwindow.h"
#include "transitionhandler.h"
#include "project/clipmanager.h"
#include "utils/KoIconUtils.h"
#include "effectslist/initeffects.h"
#include "dialogs/profilesdialog.h"
#include "ui_keyframedialog_ui.h"
...
...
@@ -158,7 +159,7 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, Timeline *timeline, CustomTra
m_thumbsTimer
.
setInterval
(
500
);
m_thumbsTimer
.
setSingleShot
(
true
);
QIcon
razorIcon
=
QIcon
::
fromTheme
(
"edit-cut"
);
QIcon
razorIcon
=
KoIconUtils
::
themedIcon
(
QStringLiteral
(
"edit-cut"
)
);
m_razorCursor
=
QCursor
(
razorIcon
.
pixmap
(
32
,
32
));
m_spacerCursor
=
QCursor
(
Qt
::
SplitHCursor
);
connect
(
m_document
->
renderer
(),
SIGNAL
(
prepareTimelineReplacement
(
QString
)),
this
,
SLOT
(
slotPrepareTimelineReplacement
(
QString
)),
Qt
::
DirectConnection
);
...
...
@@ -7413,6 +7414,8 @@ void CustomTrackView::updatePalette()
pen1
.
setColor
(
line
);
m_cursorLine
->
setPen
(
pen1
);
}
QIcon
razorIcon
=
KoIconUtils
::
themedIcon
(
QStringLiteral
(
"edit-cut"
));
m_razorCursor
=
QCursor
(
razorIcon
.
pixmap
(
32
,
32
));
}
void
CustomTrackView
::
removeTipAnimation
()
...
...
src/timeline/timeline.cpp
View file @
59e35b84
...
...
@@ -812,7 +812,8 @@ void Timeline::updatePalette()
p
.
setColor
(
QPalette
::
Button
,
norm
);
QColor
col
=
scheme
.
background
().
color
();
QColor
col2
=
scheme
.
foreground
().
color
();
headers_container
->
setStyleSheet
(
QString
(
"QLineEdit { background-color: transparent;color: %1;} QLineEdit:hover{ background-color: %2;} QLineEdit:focus { background-color: %2;}"
).
arg
(
col2
.
name
()).
arg
(
col
.
name
()));
headers_container
->
setStyleSheet
(
QStringLiteral
(
"QLineEdit { background-color: transparent;color: %1;} QLineEdit:hover{ background-color: %2;} QLineEdit:focus { background-color: %2;}"
).
arg
(
col2
.
name
()).
arg
(
col
.
name
()));
m_trackview
->
updatePalette
();
}
void
Timeline
::
refreshIcons
()
...
...
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