projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MarginWidget: Moved in create_popup
[pulseview.git]
/
pv
/
view
/
ruler.hpp
diff --git
a/pv/view/ruler.hpp
b/pv/view/ruler.hpp
index a02067f3d0e987f7c294e7b11f018822a5c9cf84..cfba0489c213c0554df35707aaac97585b4b75d6 100644
(file)
--- a/
pv/view/ruler.hpp
+++ b/
pv/view/ruler.hpp
@@
-35,18
+35,14
@@
class Ruler : public MarginWidget
Q_OBJECT
private:
Q_OBJECT
private:
- static const int RulerHeight;
- static const int MinorTickSubdivision;
- static const int HoverArrowSize;
+ /// Height of the ruler in multipes of the text height
+ static const float RulerHeight;
- static const int
Padding
;
+ static const int
MinorTickSubdivision
;
- /**
- * The vertical offset, relative to the bottom line of the widget,
- * where the arrows of the cursor labels end.
- */
- static const int BaselineOffset;
+ /// Height of the hover arrow in multiples of the text height
+ static const float HoverArrowSize;
public:
Ruler(View &parent);
public:
Ruler(View &parent);
@@
-64,6
+60,10
@@
public:
*/
QSize extended_size_hint() const;
*/
QSize extended_size_hint() const;
+private:
+ std::shared_ptr<pv::view::TimeItem> get_mouse_over_item(
+ const QPoint &pt);
+
private:
void paintEvent(QPaintEvent *event);
private:
void paintEvent(QPaintEvent *event);
@@
-74,13
+74,17
@@
private:
void mouseDoubleClickEvent(QMouseEvent *e);
void mouseDoubleClickEvent(QMouseEvent *e);
+ void contextMenuEvent(QContextMenuEvent *event);
+
void keyPressEvent(QKeyEvent *e);
private:
/**
* Draw a hover arrow under the cursor position.
void keyPressEvent(QKeyEvent *e);
private:
/**
* Draw a hover arrow under the cursor position.
+ * @param p The painter to draw into.
+ * @param text_height The height of a single text ascent.
*/
*/
- void draw_hover_mark(QPainter &p);
+ void draw_hover_mark(QPainter &p
, int text_height
);
int calculate_text_height() const;
int calculate_text_height() const;