Remove Header::BaselineOffset and move arrows as needed instead

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

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 4ad28cf1ca7529932c88e86d1f9041439cf88c9d..7be804d0760a194dec0f63a476fc85c2f2c51588 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -14,8 +14,7 @@
  * 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 "header.hpp"
@@ -24,8 +23,8 @@
 #include "signal.hpp"
 #include "tracegroup.hpp"
 
-#include <cassert>
 #include <algorithm>
+#include <cassert>
 
 #include <boost/iterator/filter_iterator.hpp>
 
@@ -39,11 +38,9 @@
 #include <pv/widgets/popup.hpp>
 
 using boost::make_filter_iterator;
+
+using std::count_if;
 using std::dynamic_pointer_cast;
-using std::max;
-using std::make_pair;
-using std::min;
-using std::pair;
 using std::shared_ptr;
 using std::stable_sort;
 using std::vector;
@@ -53,7 +50,6 @@ namespace views {
 namespace TraceView {
 
 const int Header::Padding = 12;
-const int Header::BaselineOffset = 5;
 
 static bool item_selected(shared_ptr<TraceTreeItem> r)
 {
@@ -73,7 +69,7 @@ QSize Header::sizeHint() const
        for (auto &i : items)
                if (i->enabled())
                        max_rect = max_rect.united(i->label_rect(QRect()));
-       return QSize(max_rect.width() + Padding + BaselineOffset, 0);
+       return QSize(max_rect.width() + Padding, 0);
 }
 
 QSize Header::extended_size_hint() const
@@ -90,7 +86,7 @@ vector< shared_ptr<ViewItem> > Header::items()
 
 shared_ptr<ViewItem> Header::get_mouse_over_item(const QPoint &pt)
 {
-       const QRect r(0, 0, width() - BaselineOffset, height());
+       const QRect r(0, 0, width(), height());
        const vector<shared_ptr<TraceTreeItem>> items(
                view_.list_by_type<TraceTreeItem>());
        for (auto i = items.rbegin(); i != items.rend(); i++)
@@ -101,13 +97,9 @@ shared_ptr<ViewItem> Header::get_mouse_over_item(const QPoint &pt)
 
 void Header::paintEvent(QPaintEvent*)
 {
-       // The trace labels are not drawn with the arrows exactly on the
-       // left edge of the widget, because then the selection shadow
-       // would be clipped away.
-       const QRect rect(0, 0, width() - BaselineOffset, height());
+       const QRect rect(0, 0, width(), height());
 
-       vector< shared_ptr<RowItem> > items(
-               view_.list_by_type<RowItem>());
+       vector< shared_ptr<RowItem> > items(view_.list_by_type<RowItem>());
 
        stable_sort(items.begin(), items.end(),
                [](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
@@ -139,8 +131,7 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
 
        const vector< shared_ptr<TraceTreeItem> > items(
                view_.list_by_type<TraceTreeItem>());
-       if (std::count_if(items.begin(), items.end(), item_selected) > 1)
-       {
+       if (count_if(items.begin(), items.end(), item_selected) > 1) {
                menu->addSeparator();
 
                QAction *const group = new QAction(tr("Group"), this);
@@ -179,7 +170,7 @@ void Header::on_group()
 
        shared_ptr<TraceGroup> group(new TraceGroup());
        shared_ptr<TraceTreeItem> mouse_down_item(
-               std::dynamic_pointer_cast<TraceTreeItem>(mouse_down_item_));
+               dynamic_pointer_cast<TraceTreeItem>(mouse_down_item_));
        shared_ptr<TraceTreeItem> focus_item(
                mouse_down_item ? mouse_down_item : selected_items.front());