Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-02-05 08:45:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

Hide cursor while dragging.

Browse source
This commit is contained in:
Leonardo Zide 2020-12-06 11:15:23 -08:00
parent b981de80c5
commit c6c0718d18
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
common/lc_glwidget.cpp
View file

@ -58,6 +58,9 @@ void lcGLWidget::Redraw()
lcCursor lcGLWidget::GetCursor() const lcCursor lcGLWidget::GetCursor() const
{ {
if (mTrackButton != lcTrackButton::None)
return lcCursor::Hidden;
if (mTrackTool == lcTrackTool::Select) if (mTrackTool == lcTrackTool::Select)
{ {
if (mMouseModifiers & Qt::ControlModifier) if (mMouseModifiers & Qt::ControlModifier)
@ -122,6 +125,7 @@ void lcGLWidget::SetCursor(lcCursor CursorType)
const lcCursorInfo Cursors[static_cast<int>(lcCursor::Count)] = const lcCursorInfo Cursors[static_cast<int>(lcCursor::Count)] =
{ {
{ 0, 0, "" }, // lcCursor::Hidden
{ 0, 0, "" }, // lcCursor::Default { 0, 0, "" }, // lcCursor::Default
{ 8, 3, ":/resources/cursor_insert" }, // lcCursor::Brick { 8, 3, ":/resources/cursor_insert" }, // lcCursor::Brick
{ 15, 15, ":/resources/cursor_light" }, // lcCursor::Light { 15, 15, ":/resources/cursor_light" }, // lcCursor::Light
@ -146,7 +150,12 @@ void lcGLWidget::SetCursor(lcCursor CursorType)
static_assert(LC_ARRAY_COUNT(Cursors) == static_cast<int>(lcCursor::Count), "Array size mismatch"); static_assert(LC_ARRAY_COUNT(Cursors) == static_cast<int>(lcCursor::Count), "Array size mismatch");
if (CursorType > lcCursor::Default && CursorType < lcCursor::Count) if (CursorType == lcCursor::Hidden)
{
mWidget->setCursor(Qt::BlankCursor);
mCursor = CursorType;
}
else if (CursorType >= lcCursor::First && CursorType < lcCursor::Count)
{ {
const lcCursorInfo& Cursor = Cursors[static_cast<int>(CursorType)]; const lcCursorInfo& Cursor = Cursors[static_cast<int>(CursorType)];
mWidget->setCursor(QCursor(QPixmap(Cursor.Name), Cursor.x, Cursor.y)); mWidget->setCursor(QCursor(QPixmap(Cursor.Name), Cursor.x, Cursor.y));

2
common/lc_glwidget.h
View file

@ -12,6 +12,8 @@ enum class lcDragState
enum class lcCursor enum class lcCursor
{ {
First,
Hidden = First,
Default, Default,
Brick, Brick,
Light, Light,

3
common/view.cpp
View file

@ -2277,14 +2277,11 @@ void View::UpdateTrackTool()
break; break;
} }
if (NewTrackTool != mTrackTool)
{
mTrackTool = NewTrackTool; mTrackTool = NewTrackTool;
UpdateCursor(); UpdateCursor();
if (Redraw) if (Redraw)
gMainWindow->UpdateAllViews(); gMainWindow->UpdateAllViews();
}
} }
bool View::IsTrackToolAllowed(lcTrackTool TrackTool, quint32 AllowedTransforms) const bool View::IsTrackToolAllowed(lcTrackTool TrackTool, quint32 AllowedTransforms) const