X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fwidgets%2Fpopup.cpp;h=f1486e0089ac7f8a392baf58ce438d493338cbe9;hp=47280d1ff6ddd892116228f41ccac17088a78dae;hb=60938e0430a0d08792ba53b86ca94153baaed74d;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5
diff --git a/pv/widgets/popup.cpp b/pv/widgets/popup.cpp
index 47280d1f..f1486e00 100644
--- a/pv/widgets/popup.cpp
+++ b/pv/widgets/popup.cpp
@@ -14,20 +14,18 @@
* 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
+#include
-#include
-
-#include
#include
#include
#include
+#include
-#include "popup.h"
+#include "popup.hpp"
using std::max;
using std::min;
@@ -65,17 +63,16 @@ void Popup::set_position(const QPoint point, Position pos)
MarginWidth + ((pos == Bottom) ? ArrowLength : 0),
MarginWidth + ((pos == Left) ? ArrowLength : 0),
MarginWidth + ((pos == Top) ? ArrowLength : 0));
-
}
-bool Popup::eventFilter(QObject *obj, QEvent *evt)
+bool Popup::eventFilter(QObject *obj, QEvent *event)
{
QKeyEvent *keyEvent;
(void)obj;
- if (evt->type() == QEvent::KeyPress) {
- keyEvent = static_cast(evt);
+ if (event->type() == QEvent::KeyPress) {
+ keyEvent = static_cast(event);
if (keyEvent->key() == Qt::Key_Enter ||
keyEvent->key() == Qt::Key_Return) {
close();
@@ -122,7 +119,7 @@ bool Popup::space_for_arrow() const
case Bottom:
if (point_.y() > y())
return false;
- return true;
+ return true;
case Left:
if (point_.x() < (x() + width()))
@@ -145,8 +142,7 @@ QPolygon Popup::arrow_polygon() const
const QPoint p = mapFromGlobal(point_);
const int l = ArrowLength + ArrowOverlap;
- switch (pos_)
- {
+ switch (pos_) {
case Right:
poly << QPoint(p.x() + l, p.y() - l);
break;
@@ -155,7 +151,7 @@ QPolygon Popup::arrow_polygon() const
poly << QPoint(p.x() - l, p.y() + l);
break;
- case Left:
+ case Left:
case Top:
poly << QPoint(p.x() - l, p.y() - l);
break;
@@ -163,17 +159,16 @@ QPolygon Popup::arrow_polygon() const
poly << p;
- switch (pos_)
- {
+ switch (pos_) {
case Right:
case Bottom:
poly << QPoint(p.x() + l, p.y() + l);
break;
- case Left:
+ case Left:
poly << QPoint(p.x() - l, p.y() + l);
break;
-
+
case Top:
poly << QPoint(p.x() + l, p.y() - l);
break;
@@ -238,7 +233,7 @@ void Popup::reposition_widget()
if (pos_ == Left)
o.rx() = -width();
- else if(pos_ == Top)
+ else if (pos_ == Top)
o.ry() = -height();
o += point_;
@@ -294,13 +289,13 @@ void Popup::resizeEvent(QResizeEvent*)
setMask(popup_region());
}
-void Popup::mouseReleaseEvent(QMouseEvent *e)
+void Popup::mouseReleaseEvent(QMouseEvent *event)
{
- assert(e);
+ assert(event);
// We need our own out-of-bounds click handler because QWidget counts
// the drop-shadow region as inside the widget
- if(!bubble_rect().contains(e->pos()))
+ if (!bubble_rect().contains(event->pos()))
close();
}
@@ -311,4 +306,3 @@ void Popup::showEvent(QShowEvent*)
} // namespace widgets
} // namespace pv
-