oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactored cursors same as icons

Browse Source
This commit is contained in:
itsmattkc
2019-03-10 17:58:32 +11:00
parent 8b9b688acd
commit f25f8e145c
5 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mainwindow.cpp
+1 -1
View File
@@ -195,7 +195,7 @@ MainWindow::MainWindow(QWidget *parent) :
first_show(true)
{
olive::icon::Initialize();
init_custom_cursors();
olive::cursor::Initialize();
open_debug_file();
panels/timeline.cpp
+1 -1
View File
@@ -2044,7 +2044,7 @@ void Timeline::set_tool() {
timeline_area->setCursor(Qt::IBeamCursor);
break;
case TIMELINE_TOOL_RAZOR:
timeline_area->setCursor(olive::Cursor_Razor);
timeline_area->setCursor(olive::cursor::Razor);
break;
case TIMELINE_TOOL_HAND:
timeline_area->setCursor(Qt::OpenHandCursor);
ui/cursors.cpp
+13 -13
View File
@@ -28,12 +28,12 @@
#include <QCursor>
#include <QDebug>
QCursor olive::Cursor_LeftTrim;
QCursor olive::Cursor_RightTrim;
QCursor olive::Cursor_LeftRipple;
QCursor olive::Cursor_RightRipple;
QCursor olive::Cursor_Slip;
QCursor olive::Cursor_Razor;
QCursor olive::cursor::LeftTrim;
QCursor olive::cursor::RightTrim;
QCursor olive::cursor::LeftRipple;
QCursor olive::cursor::RightRipple;
QCursor olive::cursor::Slip;
QCursor olive::cursor::Razor;
const int cursor_size = 24;
@@ -57,13 +57,13 @@ QCursor load_cursor(const QString& file, int hotX = -1, int hotY = -1, bool righ
return QCursor(pixmap, hotX, hotY);
}
void init_custom_cursors(){
void olive::cursor::Initialize(){
qInfo() << "Initializing custom cursors";
olive::Cursor_LeftTrim = load_cursor(":/cursors/1_left.svg");
olive::Cursor_RightTrim = load_cursor(":/cursors/1_right.svg");
olive::Cursor_LeftRipple = load_cursor(":/cursors/3_left.svg");
olive::Cursor_RightRipple = load_cursor(":/cursors/3_right.svg");
olive::Cursor_Slip = load_cursor(":/cursors/4.svg");
olive::Cursor_Razor = load_cursor(":/cursors/5.svg");
olive::cursor::LeftTrim = load_cursor(":/cursors/1_left.svg");
olive::cursor::RightTrim = load_cursor(":/cursors/1_right.svg");
olive::cursor::LeftRipple = load_cursor(":/cursors/3_left.svg");
olive::cursor::RightRipple = load_cursor(":/cursors/3_right.svg");
olive::cursor::Slip = load_cursor(":/cursors/4.svg");
olive::cursor::Razor = load_cursor(":/cursors/5.svg");
qInfo() << "Finished initializing custom cursors";
}
ui/cursors.h
+10 -8
View File
@@ -23,15 +23,17 @@
#include <QCursor>
void init_custom_cursors();
namespace olive{
extern QCursor Cursor_LeftTrim;
extern QCursor Cursor_RightTrim;
extern QCursor Cursor_LeftRipple;
extern QCursor Cursor_RightRipple;
extern QCursor Cursor_Slip;
extern QCursor Cursor_Razor;
namespace cursor {
extern QCursor LeftTrim;
extern QCursor RightTrim;
extern QCursor LeftRipple;
extern QCursor RightRipple;
extern QCursor Slip;
extern QCursor Razor;
void Initialize();
}
}
#endif // CURSORS_H
ui/timelinewidget.cpp
+3 -3
View File
@@ -2653,9 +2653,9 @@ void TimelineWidget::mouseMoveEvent(QMouseEvent *event) {
if (found) {
if (panel_timeline->trim_type == TRIM_IN) { // if we're trimming an IN point
setCursor(panel_timeline->tool == TIMELINE_TOOL_RIPPLE ? olive::Cursor_LeftRipple : olive::Cursor_LeftTrim);
setCursor(panel_timeline->tool == TIMELINE_TOOL_RIPPLE ? olive::cursor::LeftRipple : olive::cursor::LeftTrim);
} else { // if we're trimming an OUT point
setCursor(panel_timeline->tool == TIMELINE_TOOL_RIPPLE ? olive::Cursor_RightRipple : olive::Cursor_RightTrim);
setCursor(panel_timeline->tool == TIMELINE_TOOL_RIPPLE ? olive::cursor::RightRipple : olive::cursor::RightTrim);
}
} else {
@@ -2691,7 +2691,7 @@ void TimelineWidget::mouseMoveEvent(QMouseEvent *event) {
// we're not currently performing any slipping, all we do here is set the cursor if mouse is hovering over a
// cursor
if (getClipIndexFromCoords(panel_timeline->cursor_frame, panel_timeline->cursor_track) > -1) {
setCursor(olive::Cursor_Slip);
setCursor(olive::cursor::Slip);
} else {
unsetCursor();
}