projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tie the "sticky scrolling" setting in with the settings mgmt
[pulseview.git]
/
pv
/
view
/
timemarker.cpp
diff --git
a/pv/view/timemarker.cpp
b/pv/view/timemarker.cpp
index 8c136a18189285e3a965af58e49ad0642f002b87..3014b4a65a8e6d67adbfaa12d685766d4035302f 100644
(file)
--- a/
pv/view/timemarker.cpp
+++ b/
pv/view/timemarker.cpp
@@
-14,8
+14,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <algorithm>
*/
#include <algorithm>
@@
-38,7
+37,8
@@
using std::max;
using std::min;
namespace pv {
using std::min;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const int TimeMarker::ArrowSize = 4;
const int TimeMarker::ArrowSize = 4;
@@
-95,11
+95,11
@@
QRectF TimeMarker::label_rect(const QRectF &rect) const
return QRectF(QPointF(x - label_size.width() / 2, top), label_size);
}
return QRectF(QPointF(x - label_size.width() / 2, top), label_size);
}
-QRectF TimeMarker::hit_box_rect(const
QRectF &rect
) const
+QRectF TimeMarker::hit_box_rect(const
ViewItemPaintParams &pp
) const
{
const float x = get_x();
const float h = QFontMetrics(QApplication::font()).height();
{
const float x = get_x();
const float h = QFontMetrics(QApplication::font()).height();
- return QRectF(x - h / 2.0f,
rect.top(), h, rect
.height());
+ return QRectF(x - h / 2.0f,
pp.top(), h, pp
.height());
}
void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
}
void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
@@
-191,5
+191,6
@@
void TimeMarker::on_value_changed(const pv::util::Timestamp& value)
set_time(value);
}
set_time(value);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv