HGGitLab

Commit 3a1fea63 authored by luoliangyi's avatar luoliangyi

修复拖拽时不能多选的问题

parent 095ae722
...@@ -38,7 +38,7 @@ MainWindow::MainWindow(QWidget *parent) ...@@ -38,7 +38,7 @@ MainWindow::MainWindow(QWidget *parent)
m_view->move(0, 100); m_view->move(0, 100);
m_view->resize(400, height() - 150); m_view->resize(400, height() - 150);
m_thumb->move(450, 100); m_thumb->move(450, 100);
m_thumb->resize(200, height() - 350); m_thumb->resize(200, height() - 150);
connect(m_thumb, SIGNAL(currItemChanged(int)), this, SLOT(on_currItemChanged(int)), Qt::QueuedConnection); connect(m_thumb, SIGNAL(currItemChanged(int)), this, SLOT(on_currItemChanged(int)), Qt::QueuedConnection);
......
This diff is collapsed.
...@@ -153,6 +153,7 @@ private: ...@@ -153,6 +153,7 @@ private:
int &showWidth, int &showHeight, bool &hScroll, bool &vScroll); int &showWidth, int &showHeight, bool &hScroll, bool &vScroll);
static void recalcShowRect(int wndWidth, int wndHeight, int scrollSize, ThumbType type, bool hScroll, bool vScroll, bool showThumb, ThumbRect &thumbRect); static void recalcShowRect(int wndWidth, int wndHeight, int scrollSize, ThumbType type, bool hScroll, bool vScroll, bool showThumb, ThumbRect &thumbRect);
void reset();
QPoint getItemPos(int index); // 返回的坐标是相对于thumb区域的 QPoint getItemPos(int index); // 返回的坐标是相对于thumb区域的
void locateItem(int index); void locateItem(int index);
void locateInsert(const QPoint &pt1, const QPoint &pt2); // pt1和pt2是相对于thumb区域的 void locateInsert(const QPoint &pt1, const QPoint &pt2); // pt1和pt2是相对于thumb区域的
...@@ -220,14 +221,20 @@ private: ...@@ -220,14 +221,20 @@ private:
MouseStatus m_mousePressStatus; MouseStatus m_mousePressStatus;
int m_mousePressBeginX; int m_mousePressBeginX;
int m_mousePressBeginY; int m_mousePressBeginY;
Qt::MouseButtons m_hitMouseButtons;
Qt::KeyboardModifiers m_hitKeyboardModifiers;
int m_hitItemIndex; // 点击的索引
int m_operate; // 0, 1-拖动 2-框选 int m_operate; // 0, 1-拖动 2-框选
int m_operateStartX; int m_operateStartX;
int m_operateStartY; int m_operateStartY;
bool m_draging; bool m_draging; // 进入拖动
bool m_insertPtValid; bool m_insertPtValid;
QPoint m_insertPt1; QPoint m_insertPt1;
QPoint m_insertPt2; QPoint m_insertPt2;
int m_curInsertPos; int m_curInsertPos;
bool m_frameSelection; // 进入框选
bool m_frameSelectionRectValid;
HGRect m_frameSelectionRect;
}; };
#endif /* __HGIMGTHUMB_HPP__ */ #endif /* __HGIMGTHUMB_HPP__ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment