From 5d80f4b380129e714cded16662ef9562dc387fb9 Mon Sep 17 00:00:00 2001 From: nowrep Date: Sun, 16 Sep 2012 20:19:10 +0200 Subject: [PATCH] Use QFrame::StyledPanel for LocationBarPopup - also added copyright to new files --- src/lib/navigation/locationbarpopup.cpp | 25 ++++++++++++++++++++++--- src/lib/navigation/locationbarpopup.h | 25 +++++++++++++++++++++---- 2 files changed, 43 insertions(+), 7 deletions(-) diff --git a/src/lib/navigation/locationbarpopup.cpp b/src/lib/navigation/locationbarpopup.cpp index 9beb435e5..1c8edb16c 100644 --- a/src/lib/navigation/locationbarpopup.cpp +++ b/src/lib/navigation/locationbarpopup.cpp @@ -1,4 +1,21 @@ - +/* ============================================================ +* QupZilla - WebKit based browser +* Copyright (C) 2010-2012 Franz Fellner +* David Rosca +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* 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, see . +* ============================================================ */ #include #include "locationbarpopup.h" @@ -8,7 +25,7 @@ LocationBarPopup::LocationBarPopup(QWidget* parent) , m_alignment(Qt::AlignRight) { setAttribute(Qt::WA_DeleteOnClose); - setFrameStyle(QFrame::Panel | QFrame::Raised); + setFrameStyle(QFrame::StyledPanel | QFrame::Plain); setLineWidth(1); setMidLineWidth(2); } @@ -19,11 +36,13 @@ void LocationBarPopup::showAt(QWidget* parent) layout()->activate(); QPoint p = parent->mapToGlobal(QPoint(0, 0)); + if (m_alignment == Qt::AlignRight) { p.setX(p.x() + parent->width() - width()); } + p.setY(p.y() + parent->height()); move(p); - show(); + QFrame::show(); } diff --git a/src/lib/navigation/locationbarpopup.h b/src/lib/navigation/locationbarpopup.h index 8c04479a8..ada3f0cab 100644 --- a/src/lib/navigation/locationbarpopup.h +++ b/src/lib/navigation/locationbarpopup.h @@ -1,6 +1,23 @@ - -#ifndef QUPZILLA_LOCATION_BAR_POPUP -#define QUPZILLA_LOCATION_BAR_POPUP +/* ============================================================ +* QupZilla - WebKit based browser +* Copyright (C) 2010-2012 Franz Fellner +* David Rosca +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* 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, see . +* ============================================================ */ +#ifndef LOCATIONBARPOPUP_H +#define LOCATIONBARPOPUP_H #include @@ -21,4 +38,4 @@ private: Qt::Alignment m_alignment; }; -#endif +#endif // LOCATIONBARPOPUP_H