Skip to content

Commit

Permalink
cursor size depends on DPI
Browse files Browse the repository at this point in the history
  • Loading branch information
@vicrucann
vicrucann committed Sep 15, 2016
1 parent 226a7a3 commit bf2834f
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
32 changes: 16 additions & 16 deletions src/cherish/Data.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ const QPixmap &Data::editDeleteCursor()
QString fname(":/edit-delete-cursor-24px.svg");
Q_ASSERT_X(!QPixmap(fname).isNull(), Q_FUNC_INFO, "Required resource not available");
QIcon icon(fname);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE, cher::CURSOR_SIZE);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE*cher::DPI_SCALING, cher::CURSOR_SIZE*cher::DPI_SCALING);

return pmap;
}
Expand All @@ -520,7 +520,7 @@ const QPixmap &Data::sceneOrbitPixmap()
QString fname(":/scene-orbit-24px.svg");
Q_ASSERT_X(!QPixmap(fname).isNull(), Q_FUNC_INFO, "Required resource not available");
QIcon icon(fname);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE, cher::CURSOR_SIZE);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE*cher::DPI_SCALING, cher::CURSOR_SIZE*cher::DPI_SCALING);

return pmap;
}
Expand All @@ -530,7 +530,7 @@ const QPixmap &Data::scenePanPixmap()
QString fname(":/scene-pan-24px.svg");
Q_ASSERT_X(!QPixmap(fname).isNull(), Q_FUNC_INFO, "Required resource not available");
QIcon icon(fname);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE, cher::CURSOR_SIZE);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE*cher::DPI_SCALING, cher::CURSOR_SIZE*cher::DPI_SCALING);

return pmap;
}
Expand All @@ -540,7 +540,7 @@ const QPixmap &Data::sceneZoomPixmap()
QString fname(":/scene-zoom-24px.svg");
Q_ASSERT_X(!QPixmap(fname).isNull(), Q_FUNC_INFO, "Required resource not available");
QIcon icon(fname);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE, cher::CURSOR_SIZE);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE*cher::DPI_SCALING, cher::CURSOR_SIZE*cher::DPI_SCALING);

return pmap;
}
Expand All @@ -550,7 +550,7 @@ const QPixmap &Data::sceneCanvasOffsetCursor()
QString fname(":/scene-canvas-offset-cursor-24px.svg");
Q_ASSERT_X(!QPixmap(fname).isNull(), Q_FUNC_INFO, "Required resource not available");
QIcon icon(fname);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE, cher::CURSOR_SIZE);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE*cher::DPI_SCALING, cher::CURSOR_SIZE*cher::DPI_SCALING);

return pmap;
}
Expand All @@ -560,7 +560,7 @@ const QPixmap &Data::sceneCanvasRotateCursor()
QString fname(":/scene-canvas-rotate-cursor-24px.svg");
Q_ASSERT_X(!QPixmap(fname).isNull(), Q_FUNC_INFO, "Required resource not available");
QIcon icon(fname);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE, cher::CURSOR_SIZE);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE*cher::DPI_SCALING, cher::CURSOR_SIZE*cher::DPI_SCALING);

return pmap;
}
Expand All @@ -570,7 +570,7 @@ const QPixmap &Data::sceneCanvasCloneCursor()
QString fname(":/scene-newcanvas-24px.svg");
Q_ASSERT_X(!QPixmap(fname).isNull(), Q_FUNC_INFO, "Required resource not available");
QIcon icon(fname);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE, cher::CURSOR_SIZE);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE*cher::DPI_SCALING, cher::CURSOR_SIZE*cher::DPI_SCALING);

return pmap;
}
Expand All @@ -580,7 +580,7 @@ const QPixmap &Data::sceneSelectPixmap()
QString fname(":/scene-select-24px.svg");
Q_ASSERT_X(!QPixmap(fname).isNull(), Q_FUNC_INFO, "Required resource not available");
QIcon icon(fname);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE, cher::CURSOR_SIZE);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE*cher::DPI_SCALING, cher::CURSOR_SIZE*cher::DPI_SCALING);

return pmap;
}
Expand All @@ -590,7 +590,7 @@ const QPixmap &Data::sceneSelect3DPixmap()
QString fname(":/scene-select3d-24px.svg");
Q_ASSERT_X(!QPixmap(fname).isNull(), Q_FUNC_INFO, "Required resource not available");
QIcon icon(fname);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE, cher::CURSOR_SIZE);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE*cher::DPI_SCALING, cher::CURSOR_SIZE*cher::DPI_SCALING);

return pmap;
}
Expand All @@ -600,7 +600,7 @@ const QPixmap &Data::sceneSketchPixmap()
QString fname(":/scene-sketch-24px.svg");
Q_ASSERT_X(!QPixmap(fname).isNull(), Q_FUNC_INFO, "Required resource not available");
QIcon icon(fname);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE, cher::CURSOR_SIZE);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE*cher::DPI_SCALING, cher::CURSOR_SIZE*cher::DPI_SCALING);

return pmap;
}
Expand All @@ -610,7 +610,7 @@ const QPixmap &Data::sceneEraserPixmap()
QString fname(":/scene-eraser-cursor-24px.svg");
Q_ASSERT_X(!QPixmap(fname).isNull(), Q_FUNC_INFO, "Required resource not available");
QIcon icon(fname);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE, cher::CURSOR_SIZE);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE*cher::DPI_SCALING, cher::CURSOR_SIZE*cher::DPI_SCALING);

return pmap;
}
Expand All @@ -620,7 +620,7 @@ const QPixmap &Data::sceneImageFlipHPixmap()
QString fname(":/scene-image-flipv-24px.svg");
Q_ASSERT_X(!QPixmap(fname).isNull(), Q_FUNC_INFO, "Required resource not available");
QIcon icon(fname);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE, cher::CURSOR_SIZE);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE*cher::DPI_SCALING, cher::CURSOR_SIZE*cher::DPI_SCALING);

return pmap;
}
Expand All @@ -630,7 +630,7 @@ const QPixmap &Data::sceneImageFlipVPixmap()
QString fname(":/scene-image-fliph-24px.svg");
Q_ASSERT_X(!QPixmap(fname).isNull(), Q_FUNC_INFO, "Required resource not available");
QIcon icon(fname);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE, cher::CURSOR_SIZE);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE*cher::DPI_SCALING, cher::CURSOR_SIZE*cher::DPI_SCALING);

return pmap;
}
Expand All @@ -640,7 +640,7 @@ const QPixmap &Data::sceneImageMovePixmap()
QString fname(":/scene-image-move-24px.svg");
Q_ASSERT_X(!QPixmap(fname).isNull(), Q_FUNC_INFO, "Required resource not available");
QIcon icon(fname);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE, cher::CURSOR_SIZE);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE*cher::DPI_SCALING, cher::CURSOR_SIZE*cher::DPI_SCALING);

return pmap;
}
Expand All @@ -650,7 +650,7 @@ const QPixmap &Data::sceneImageScalePixmap()
QString fname(":/scene-image-scale-cursor-24px.svg");
Q_ASSERT_X(!QPixmap(fname).isNull(), Q_FUNC_INFO, "Required resource not available");
QIcon icon(fname);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE, cher::CURSOR_SIZE);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE*cher::DPI_SCALING, cher::CURSOR_SIZE*cher::DPI_SCALING);

return pmap;
}
Expand All @@ -660,7 +660,7 @@ const QPixmap &Data::sceneImageRotatePixmap()
QString fname(":/scene-image-rotate-24px.svg");
Q_ASSERT_X(!QPixmap(fname).isNull(), Q_FUNC_INFO, "Required resource not available");
QIcon icon(fname);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE, cher::CURSOR_SIZE);
static QPixmap pmap = icon.pixmap(cher::CURSOR_SIZE*cher::DPI_SCALING, cher::CURSOR_SIZE*cher::DPI_SCALING);

return pmap;
}
2 changes: 1 addition & 1 deletion src/cherish/Settings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ enum TraversalMask{
};

const osg::Vec4 BACKGROUND_CLR = solarized::base3;
const int CURSOR_SIZE = 32;
const int CURSOR_SIZE = 18;

const osg::Vec3f NORMAL = osg::Vec3f(0.f,0.f,1.f);

Expand Down

0 comments on commit bf2834f

Please sign in to comment.