X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=inline;f=pv%2Fview%2Fheader.cpp;h=8849ee3fed2beb4b7fe8e9ba1fcfd445412c41df;hb=53bb2e1de75f5cca9244efc83c4e77a222e322f4;hp=58c21e596c7ab9ace1beb392a5510b270609dddf;hpb=cc88566ce77bed57358a82dec5da648feb66d10b;p=pulseview.git
diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 58c21e5..8849ee3 100644
--- 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 .
*/
#include "header.hpp"
@@ -49,7 +48,8 @@ using std::stable_sort;
using std::vector;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const int Header::Padding = 12;
const int Header::BaselineOffset = 5;
@@ -92,9 +92,9 @@ shared_ptr Header::get_mouse_over_item(const QPoint &pt)
const QRect r(0, 0, width() - BaselineOffset, height());
const vector> items(
view_.list_by_type());
- for (auto &i : items)
- if (i->enabled() && i->label_rect(r).contains(pt))
- return i;
+ for (auto i = items.rbegin(); i != items.rend(); i++)
+ if ((*i)->enabled() && (*i)->label_rect(r).contains(pt))
+ return *i;
return shared_ptr();
}
@@ -105,18 +105,17 @@ void Header::paintEvent(QPaintEvent*)
// would be clipped away.
const QRect rect(0, 0, width() - BaselineOffset, height());
- vector< shared_ptr > items(
- view_.list_by_type());
+ vector< shared_ptr > items(
+ view_.list_by_type());
stable_sort(items.begin(), items.end(),
- [](const shared_ptr &a, const shared_ptr &b) {
- return a->visual_v_offset() < b->visual_v_offset(); });
+ [](const shared_ptr &a, const shared_ptr &b) {
+ return a->point(QRect()).y() < b->point(QRect()).y(); });
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
- for (const shared_ptr r : items)
- {
+ for (const shared_ptr r : items) {
assert(r);
const bool highlight = !item_dragging_ &&
@@ -154,15 +153,15 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
menu->exec(event->globalPos());
}
-void Header::keyPressEvent(QKeyEvent *e)
+void Header::keyPressEvent(QKeyEvent *event)
{
- assert(e);
+ assert(event);
- MarginWidget::keyPressEvent(e);
+ MarginWidget::keyPressEvent(event);
- if (e->key() == Qt::Key_G && e->modifiers() == Qt::ControlModifier)
+ if (event->key() == Qt::Key_G && event->modifiers() == Qt::ControlModifier)
on_group();
- else if (e->key() == Qt::Key_U && e->modifiers() == Qt::ControlModifier)
+ else if (event->key() == Qt::Key_U && event->modifiers() == Qt::ControlModifier)
on_ungroup();
}
@@ -219,5 +218,6 @@ void Header::on_ungroup()
} while (restart);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv