equal
deleted
inserted
replaced
260 icone = style->pixelMetric(QStyle::PM_SmallIconSize, &opt, q); |
260 icone = style->pixelMetric(QStyle::PM_SmallIconSize, &opt, q); |
261 const int fw = style->pixelMetric(QStyle::PM_MenuPanelWidth, &opt, q); |
261 const int fw = style->pixelMetric(QStyle::PM_MenuPanelWidth, &opt, q); |
262 const int deskFw = style->pixelMetric(QStyle::PM_MenuDesktopFrameWidth, &opt, q); |
262 const int deskFw = style->pixelMetric(QStyle::PM_MenuDesktopFrameWidth, &opt, q); |
263 const int tearoffHeight = tearoff ? style->pixelMetric(QStyle::PM_MenuTearoffHeight, &opt, q) : 0; |
263 const int tearoffHeight = tearoff ? style->pixelMetric(QStyle::PM_MenuTearoffHeight, &opt, q) : 0; |
264 |
264 |
265 //for compatability now - will have to refactor this away.. |
265 //for compatibility now - will have to refactor this away |
266 tabWidth = 0; |
266 tabWidth = 0; |
267 maxIconWidth = 0; |
267 maxIconWidth = 0; |
268 hasCheckableItems = false; |
268 hasCheckableItems = false; |
269 ncols = 1; |
269 ncols = 1; |
270 sloppyAction = 0; |
270 sloppyAction = 0; |
1152 } |
1152 } |
1153 } |
1153 } |
1154 |
1154 |
1155 bool QMenuPrivate::hasMouseMoved(const QPoint &globalPos) |
1155 bool QMenuPrivate::hasMouseMoved(const QPoint &globalPos) |
1156 { |
1156 { |
1157 //determines if the mouse has moved (ie its intial position has |
1157 //determines if the mouse has moved (ie its initial position has |
1158 //changed by more than QApplication::startDragDistance() |
1158 //changed by more than QApplication::startDragDistance() |
1159 //or if there were at least 6 mouse motions) |
1159 //or if there were at least 6 mouse motions) |
1160 return motions > 6 || |
1160 return motions > 6 || |
1161 QApplication::startDragDistance() < (mousePopupPos - globalPos).manhattanLength(); |
1161 QApplication::startDragDistance() < (mousePopupPos - globalPos).manhattanLength(); |
1162 } |
1162 } |