forked from qt-creator/qt-creator
* Activate new ADS feature focus highlight * Remove resources.qrc and related *.svg files * Clean up new and existing source Base repository was merged until commit 3de877fe5635ff51a6d1205ca98aad85d204427f Merged changes from base repository include the following: * Fix wrong current index when removing a widget from DockAreaLayout * Fix invisible TabWidget for DockWidgets that are not part of a restored state * Enable ClickFocus for DockWidget to support focussing in case the content does not support it * Move focus related functionality into DockFocusController class * Add new DockManger config flag FocusStyling * Add support for focus styling of FloatingWidgetTitleBar * Improve focus handling when dropping a DockWidget * Improve highlighting focused DockWidget * Improve setting of DockWidgetTab focus * Add styling of focused DockWidget * Fix docking of floating widgets for macOS * Fix setting of DockingStateReader file version - use internal file version instead of user file version * Fix saveState() and restoreState() version handling to work like the function from QMainWindow * Fix escape key handling in native window event function if event WM_EXITSIZEMOVE occurs * Implement windows drag handling with native WM_ nonclient area messages * Fix showing DockArea when inserting a DockWidget in a hidden DockArea * Fix setting DockAreaTabBar index to prevent showing of tab 0 when inserting a DockWidget into an area with no current index tab * Fix wrong insertion order of DockWidget when dropping a floating widget to the left or top container drop area * Fix tab changes position when redocking it to the same position * Add nullptr check to fix potential nullptr access when closing a FloatingDockContainer * Fix single DockArea cannot be split * Fix visibility issue when adding dock widget after all other dock widgets have ben closed * Fix FloatingDragPreview flashing of hidden overlay when dragging the last visible DockWidget in non opaque docking mode * Fix FloatingDragPreview preventing dock widget from floating when dragging over another dock widget * Fix DockWidget::setWidget function to test for QAbstractScrollArea instead of QScrollArea. Now setWidget properly supports ItemViews like QTreeView or QTableView * Fix wrong display of center drop area when dragging over invisible dock area title bar * Fix bug that drop overlay sometimes was not visible when moving the drag preview over a floating window * Fix dropping of FloatingDragPreview into center of dock container with only one single visible dock area. If this happens the dropped dock widget needs to get tabified * Fix crash when trying to make a DockWidget floating in non-opaque mode if the DockWidget is not floatable * Fix DockWidgetTab to provide the right size when starting floating * Add DockWidget functions setAsCurrentTab, raise, isCurrentTab, isTabbed * Add new config flag HideSingleCentralWidgetTitleBar to enable a central single dock widget in the main dock container (dock manager) without titlebar * Fix DockContainerWidget::hasTopLevelDockWidget() and DockContainerWidget::topLevelDockArea() to work properly also for the main non floating dock container * Fix ElidingLabel to properly support Qt::ElideNone * Add setElideMode function to DockWidgetTab * Add setFullScreen(), setNormal() and isFullScreen() function to DockWidget * Fix takeWidget() function and fixed setWidget() function to handle case when there is already a content widget Task-number: QDS-2180 Change-Id: Ie30648ba329016c91fd19e9b4e12e31e47614b18 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
173 lines
5.2 KiB
C++
173 lines
5.2 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2020 Uwe Kindler
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of Qt Creator.
|
|
**
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
** included in the packaging of this file. Please review the following
|
|
** information to ensure the GNU General Public License requirements will
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include "floatingwidgettitlebar.h"
|
|
|
|
#include "ads_globals.h"
|
|
#include "elidinglabel.h"
|
|
#include "floatingdockcontainer.h"
|
|
|
|
#include <QHBoxLayout>
|
|
#include <QMouseEvent>
|
|
#include <QPixmap>
|
|
#include <QPushButton>
|
|
#include <QStyle>
|
|
#include <QToolButton>
|
|
|
|
#include <iostream>
|
|
|
|
namespace ADS {
|
|
|
|
using TabLabelType = ElidingLabel;
|
|
using CloseButtonType = QToolButton;
|
|
|
|
/**
|
|
* @brief Private data class of public interface CFloatingWidgetTitleBar
|
|
*/
|
|
class FloatingWidgetTitleBarPrivate
|
|
{
|
|
public:
|
|
FloatingWidgetTitleBar *q; ///< public interface class
|
|
QLabel *m_iconLabel = nullptr;
|
|
TabLabelType *m_titleLabel = nullptr;
|
|
CloseButtonType *m_closeButton = nullptr;
|
|
FloatingDockContainer *m_floatingWidget = nullptr;
|
|
eDragState m_dragState = DraggingInactive;
|
|
|
|
FloatingWidgetTitleBarPrivate(FloatingWidgetTitleBar *parent)
|
|
: q(parent)
|
|
{}
|
|
|
|
/**
|
|
* Creates the complete layout including all controls
|
|
*/
|
|
void createLayout();
|
|
};
|
|
|
|
void FloatingWidgetTitleBarPrivate::createLayout()
|
|
{
|
|
m_titleLabel = new TabLabelType();
|
|
m_titleLabel->setElideMode(Qt::ElideRight);
|
|
m_titleLabel->setText("DockWidget->windowTitle()");
|
|
m_titleLabel->setObjectName("floatingTitleLabel");
|
|
m_titleLabel->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
|
|
|
|
m_closeButton = new CloseButtonType();
|
|
m_closeButton->setObjectName("floatingTitleCloseButton");
|
|
m_closeButton->setAutoRaise(true);
|
|
internal::setButtonIcon(m_closeButton,
|
|
QStyle::SP_TitleBarCloseButton,
|
|
ADS::FloatingWidgetCloseIcon);
|
|
m_closeButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
|
|
m_closeButton->setIconSize(QSize(14, 14));
|
|
m_closeButton->setVisible(true);
|
|
m_closeButton->setFocusPolicy(Qt::NoFocus);
|
|
QObject::connect(m_closeButton,
|
|
&QPushButton::clicked,
|
|
q,
|
|
&FloatingWidgetTitleBar::closeRequested);
|
|
|
|
QFontMetrics fontMetrics(m_titleLabel->font());
|
|
int spacing = qRound(fontMetrics.height() / 4.0);
|
|
|
|
// Fill the layout
|
|
QBoxLayout *layout = new QBoxLayout(QBoxLayout::LeftToRight);
|
|
layout->setContentsMargins(6, 0, 0, 0);
|
|
layout->setSpacing(0);
|
|
q->setLayout(layout);
|
|
layout->addWidget(m_titleLabel, 1);
|
|
layout->addSpacing(spacing);
|
|
layout->addWidget(m_closeButton);
|
|
layout->setAlignment(Qt::AlignCenter);
|
|
|
|
m_titleLabel->setVisible(true);
|
|
}
|
|
|
|
FloatingWidgetTitleBar::FloatingWidgetTitleBar(FloatingDockContainer *parent)
|
|
: QFrame(parent)
|
|
, d(new FloatingWidgetTitleBarPrivate(this))
|
|
{
|
|
d->m_floatingWidget = parent;
|
|
d->createLayout();
|
|
}
|
|
|
|
FloatingWidgetTitleBar::~FloatingWidgetTitleBar()
|
|
{
|
|
delete d;
|
|
}
|
|
|
|
void FloatingWidgetTitleBar::mousePressEvent(QMouseEvent *event)
|
|
{
|
|
if (event->button() == Qt::LeftButton) {
|
|
d->m_dragState = DraggingFloatingWidget;
|
|
d->m_floatingWidget->startDragging(event->pos(), d->m_floatingWidget->size(), this);
|
|
return;
|
|
}
|
|
Super::mousePressEvent(event);
|
|
}
|
|
|
|
void FloatingWidgetTitleBar::mouseReleaseEvent(QMouseEvent *event)
|
|
{
|
|
d->m_dragState = DraggingInactive;
|
|
if (d->m_floatingWidget)
|
|
d->m_floatingWidget->finishDragging();
|
|
|
|
Super::mouseReleaseEvent(event);
|
|
}
|
|
|
|
void FloatingWidgetTitleBar::mouseMoveEvent(QMouseEvent *event)
|
|
{
|
|
if (!(event->buttons() & Qt::LeftButton) || DraggingInactive == d->m_dragState) {
|
|
d->m_dragState = DraggingInactive;
|
|
Super::mouseMoveEvent(event);
|
|
return;
|
|
}
|
|
|
|
// move floating window
|
|
if (DraggingFloatingWidget == d->m_dragState) {
|
|
d->m_floatingWidget->moveFloating();
|
|
Super::mouseMoveEvent(event);
|
|
return;
|
|
}
|
|
Super::mouseMoveEvent(event);
|
|
}
|
|
|
|
void FloatingWidgetTitleBar::enableCloseButton(bool enable)
|
|
{
|
|
d->m_closeButton->setEnabled(enable);
|
|
}
|
|
|
|
void FloatingWidgetTitleBar::setTitle(const QString &text)
|
|
{
|
|
d->m_titleLabel->setText(text);
|
|
}
|
|
|
|
void FloatingWidgetTitleBar::updateStyle()
|
|
{
|
|
internal::repolishStyle(this, internal::RepolishDirectChildren);
|
|
}
|
|
|
|
} // namespace ADS
|