TimeMarker: Align to a integer pixel offset

[pulseview.git] / pv / view / cursor.cpp

diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index 4f2ef126a83fa357e88f5b6d69872fd0802cc29e..f22680b9f46f547bfbb315f43f9131140a588dc0 100644 (file)
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -14,15 +14,14 @@
  * 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 "cursor.hpp"
 
+#include "pv/util.hpp"
 #include "ruler.hpp"
 #include "view.hpp"
-#include "pv/util.hpp"
 
 #include <QApplication>
 #include <QBrush>
@@ -35,9 +34,8 @@
 #include <cstdio>
 #include <limits>
 
-using std::abs;
+using std::abs; // Force usage of std::abs() instead of C's abs().
 using std::shared_ptr;
-using std::numeric_limits;
 
 namespace pv {
 namespace views {
@@ -69,7 +67,7 @@ QRectF Cursor::label_rect(const QRectF &rect) const
        const shared_ptr<Cursor> other(get_other_cursor());
        assert(other);
 
-       const float x = ((time_ - view_.offset())/ view_.scale()).convert_to<float>();
+       const float x = get_x();
 
        QFontMetrics m(QApplication::font());
        QSize text_size = m.boundingRect(get_text()).size();