aiden
/
fishui
mirror of https://github.com/cutefishos/fishui
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TopLevelMenu rename to DesktopMenu

Browse Source
pull/3/head
cutefishd 5 years ago
parent f8efe54a38
commit 733c34680b
7 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File

3
src/CMakeLists.txt
Unescape Escape View File

@ -13,7 +13,8 @@ set(SOURCES
windowhelper.cpp
iconitem.cpp
managedtexturenode.cpp
popupwindow.cpp
desktop/menupopupwindow.cpp
meuikit.qrc
meui-style/style.qrc

2
src/controls/TopLevelMenu.qml → src/controls/DesktopMenu.qml
Unescape Escape View File

@ -3,7 +3,7 @@ import QtQuick.Layouts 1.12
import QtQuick.Controls 2.12
import MeuiKit 1.0 as Meui
Meui.PopupWindow {
Meui.MenuPopupWindow {
id: control
default property alias content : _mainLayout.data

2
src/controls/qmldir
Unescape Escape View File

@ -19,4 +19,4 @@ RoundedRect 1.0 RoundedRect.qml
Window 1.0 Window.qml
WindowButton 1.0 WindowButton.qml
Toast 1.0 Toast.qml
TopLevelMenu 1.0 TopLevelMenu.qml
DesktopMenu 1.0 DesktopMenu.qml

33
src/popupwindow.cpp → src/desktop/menupopupwindow.cpp
Unescape Escape View File

@ -17,13 +17,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "popupwindow.h"
#include "menupopupwindow.h"
#include <QGuiApplication>
#include <QQuickRenderControl>
#include <QQuickItem>
#include <QScreen>
PopupWindow::PopupWindow(QQuickWindow *parent)
MenuPopupWindow::MenuPopupWindow(QQuickWindow *parent)
: QQuickWindow(parent)
, m_parentItem(0)
, m_contentItem(0)
@ -36,13 +36,13 @@ PopupWindow::PopupWindow(QQuickWindow *parent)
this, SLOT(applicationStateChanged(Qt::ApplicationState)));
}
void PopupWindow::applicationStateChanged(Qt::ApplicationState state)
void MenuPopupWindow::applicationStateChanged(Qt::ApplicationState state)
{
if (state != Qt::ApplicationActive)
dismissPopup();
}
void PopupWindow::show()
void MenuPopupWindow::show()
{
QPoint pos = QCursor::pos();
int w = m_contentItem->implicitWidth();
@ -59,7 +59,7 @@ void PopupWindow::show()
QRect g = pw->screen()->availableGeometry();
if (posx + w > g.right()) {
if (qobject_cast<PopupWindow *>(transientParent())) {
if (qobject_cast<MenuPopupWindow *>(transientParent())) {
// reposition submenu window on the parent menu's left side
int submenuOverlap = pw->x() + pw->width() - posx;
posx -= pw->width() + w - 2 * submenuOverlap;
@ -70,6 +70,9 @@ void PopupWindow::show()
posx = qMax(posx, g.left());
}
m_mouseMoved = false;
m_dismissed = false;
posy = qBound(g.top(), posy, g.bottom() - h);
setGeometry(posx, posy, w, h);
@ -79,14 +82,14 @@ void PopupWindow::show()
setKeyboardGrabEnabled(true);
}
void PopupWindow::setParentItem(QQuickItem *item)
void MenuPopupWindow::setParentItem(QQuickItem *item)
{
m_parentItem = item;
if (m_parentItem)
setTransientParent(m_parentItem->window());
}
void PopupWindow::setPopupContentItem(QQuickItem *contentItem)
void MenuPopupWindow::setPopupContentItem(QQuickItem *contentItem)
{
if (!contentItem)
return;
@ -95,21 +98,21 @@ void PopupWindow::setPopupContentItem(QQuickItem *contentItem)
m_contentItem = contentItem;
}
void PopupWindow::dismissPopup()
void MenuPopupWindow::dismissPopup()
{
m_dismissed = true;
emit popupDismissed();
hide();
}
void PopupWindow::mouseMoveEvent(QMouseEvent *e)
void MenuPopupWindow::mouseMoveEvent(QMouseEvent *e)
{
m_mouseMoved = true;
QQuickWindow::mouseMoveEvent(e);
}
void PopupWindow::mousePressEvent(QMouseEvent *e)
void MenuPopupWindow::mousePressEvent(QMouseEvent *e)
{
QRect rect = QRect(QPoint(), size());
if (rect.contains(e->pos())) {
@ -119,15 +122,17 @@ void PopupWindow::mousePressEvent(QMouseEvent *e)
}
}
void PopupWindow::mouseReleaseEvent(QMouseEvent *e)
void MenuPopupWindow::mouseReleaseEvent(QMouseEvent *e)
{
QRect rect = QRect(QPoint(), size());
if (rect.contains(e->pos())) {
if (m_mouseMoved) {
QMouseEvent pe = QMouseEvent(QEvent::MouseButtonPress, e->pos(), e->button(), e->buttons(), e->modifiers());
QQuickWindow::mousePressEvent(&pe);
if (!m_dismissed)
if (!m_dismissed) {
dismissPopup();
QQuickWindow::mouseReleaseEvent(e);
}
}
m_mouseMoved = true;
}
@ -136,14 +141,14 @@ void PopupWindow::mouseReleaseEvent(QMouseEvent *e)
// dismissPopup();
}
bool PopupWindow::event(QEvent *event)
bool MenuPopupWindow::event(QEvent *event)
{
//QTBUG-45079
//This is a workaround for popup menu not being closed when using touch input.
//Currently mouse synthesized events are not created for touch events which are
//outside the qquickwindow.
if (event->type() == QEvent::TouchBegin && !qobject_cast<PopupWindow*>(transientParent())) {
if (event->type() == QEvent::TouchBegin && !qobject_cast<MenuPopupWindow*>(transientParent())) {
QRect rect = QRect(QPoint(), size());
QTouchEvent *touch = static_cast<QTouchEvent*>(event);
QTouchEvent::TouchPoint point = touch->touchPoints().first();

10
src/popupwindow.h → src/desktop/menupopupwindow.h
Unescape Escape View File

@ -17,13 +17,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef TOPLEVELMENU_H
#define TOPLEVELMENU_H
#ifndef MENUPOPUPWINDOW_H
#define MENUPOPUPWINDOW_H
#include <QQuickWindow>
#include <QQuickItem>
class PopupWindow : public QQuickWindow
class MenuPopupWindow : public QQuickWindow
{
Q_OBJECT
Q_PROPERTY(QQuickItem *popupContentItem READ popupContentItem WRITE setPopupContentItem)
@ -31,7 +31,7 @@ class PopupWindow : public QQuickWindow
Q_PROPERTY(QQuickItem *parentItem READ parentItem WRITE setParentItem)
public:
PopupWindow(QQuickWindow *parent = nullptr);
MenuPopupWindow(QQuickWindow *parent = nullptr);
QQuickItem *popupContentItem() const { return m_contentItem; }
void setPopupContentItem(QQuickItem *popupContentItem);
@ -63,4 +63,4 @@ private:
bool m_dismissed;
};
#endif // POPUPWINDOW_H
#endif

7
src/meuikit.cpp
Unescape Escape View File

@ -24,7 +24,8 @@
#include "blurhelper/windowblur.h"
#include "windowhelper.h"
#include "iconitem.h"
#include "popupwindow.h"
#include "desktop/menupopupwindow.h"
#include <QDebug>
#include <QQmlEngine>
@ -55,7 +56,7 @@ void MeuiKit::registerTypes(const char *uri)
qmlRegisterType<WindowBlur>(uri, 1, 0, "WindowBlur");
qmlRegisterType<WindowHelper>(uri, 1, 0, "WindowHelper");
qmlRegisterType<IconItem>(uri, 1, 0, "IconItem");
qmlRegisterType<PopupWindow>(uri, 1, 0, "PopupWindow");
qmlRegisterType<MenuPopupWindow>(uri, 1, 0, "MenuPopupWindow");
qmlRegisterSingletonType(componentUrl(QStringLiteral("Theme.qml")), uri, 1, 0, "Theme");
qmlRegisterSingletonType(componentUrl(QStringLiteral("Units.qml")), uri, 1, 0, "Units");
@ -68,7 +69,7 @@ void MeuiKit::registerTypes(const char *uri)
qmlRegisterType(componentUrl(QStringLiteral("Toast.qml")), uri, 1, 0, "Toast");
qmlRegisterType(componentUrl(QStringLiteral("Window.qml")), uri, 1, 0, "Window");
qmlRegisterType(componentUrl(QStringLiteral("WindowButton.qml")), uri, 1, 0, "WindowButton");
qmlRegisterType(componentUrl(QStringLiteral("TopLevelMenu.qml")), uri, 1, 0, "TopLevelMenu");
qmlRegisterType(componentUrl(QStringLiteral("DesktopMenu.qml")), uri, 1, 0, "DesktopMenu");
qmlProtectModule(uri, 1);
}

2
src/meuikit.qrc
Unescape Escape View File

@ -10,7 +10,7 @@
<file alias="Units.qml">controls/Units.qml</file>
<file alias="Window.qml">controls/Window.qml</file>
<file alias="WindowButton.qml">controls/WindowButton.qml</file>
<file alias="TopLevelMenu.qml">controls/TopLevelMenu.qml</file>
<file alias="DesktopMenu.qml">controls/DesktopMenu.qml</file>
<file>images/refresh.svg</file>
<file>images/dark/close.svg</file>
<file>images/dark/maximize.svg</file>

Write Preview
Loading…
Cancel
Save