juicy compiler error
This commit is contained in:
+21
-21
@@ -1,11 +1,11 @@
|
||||
#include "chatwidgetheader.h"
|
||||
#include "QPainter"
|
||||
#include "colorscheme.h"
|
||||
#include "chatwidget.h"
|
||||
#include "notebookpage.h"
|
||||
#include "QByteArray"
|
||||
#include "QDrag"
|
||||
#include "QMimeData"
|
||||
#include "QByteArray"
|
||||
#include "QPainter"
|
||||
#include "chatwidget.h"
|
||||
#include "colorscheme.h"
|
||||
#include "notebookpage.h"
|
||||
|
||||
ChatWidgetHeader::ChatWidgetHeader()
|
||||
: QWidget()
|
||||
@@ -13,7 +13,8 @@ ChatWidgetHeader::ChatWidgetHeader()
|
||||
setFixedHeight(32);
|
||||
}
|
||||
|
||||
void ChatWidgetHeader::paintEvent(QPaintEvent *)
|
||||
void
|
||||
ChatWidgetHeader::paintEvent(QPaintEvent *)
|
||||
{
|
||||
QPainter painter(this);
|
||||
|
||||
@@ -22,34 +23,33 @@ void ChatWidgetHeader::paintEvent(QPaintEvent *)
|
||||
painter.drawRect(0, 0, width() - 1, height() - 1);
|
||||
}
|
||||
|
||||
void ChatWidgetHeader::mousePressEvent(QMouseEvent *event)
|
||||
void
|
||||
ChatWidgetHeader::mousePressEvent(QMouseEvent *event)
|
||||
{
|
||||
dragging = true;
|
||||
|
||||
dragStart = event->pos();
|
||||
}
|
||||
|
||||
void ChatWidgetHeader::mouseMoveEvent(QMouseEvent *event)
|
||||
void
|
||||
ChatWidgetHeader::mouseMoveEvent(QMouseEvent *event)
|
||||
{
|
||||
if (dragging)
|
||||
{
|
||||
if (dragging) {
|
||||
if (std::abs(dragStart.x() - event->pos().x()) > 12 ||
|
||||
std::abs(dragStart.y() - event->pos().y()) > 12)
|
||||
{
|
||||
std::abs(dragStart.y() - event->pos().y()) > 12) {
|
||||
auto chatWidget = getChatWidget();
|
||||
auto page = static_cast<NotebookPage*>(chatWidget->parentWidget());
|
||||
auto page = static_cast<NotebookPage *>(chatWidget->parentWidget());
|
||||
|
||||
if (page != NULL)
|
||||
{
|
||||
if (page != NULL) {
|
||||
NotebookPage::isDraggingSplit = true;
|
||||
NotebookPage::draggingSplit = chatWidget;
|
||||
|
||||
auto originalLocation = page->removeFromLayout(chatWidget);
|
||||
|
||||
//page->repaint();
|
||||
// page->repaint();
|
||||
|
||||
QDrag *drag = new QDrag(chatWidget);
|
||||
QMimeData* mimeData = new QMimeData;
|
||||
QMimeData *mimeData = new QMimeData;
|
||||
|
||||
mimeData->setData("chatterino/split", "xD");
|
||||
|
||||
@@ -57,8 +57,7 @@ void ChatWidgetHeader::mouseMoveEvent(QMouseEvent *event)
|
||||
|
||||
Qt::DropAction dropAction = drag->exec(Qt::MoveAction);
|
||||
|
||||
if (dropAction == Qt::IgnoreAction)
|
||||
{
|
||||
if (dropAction == Qt::IgnoreAction) {
|
||||
page->addToLayout(chatWidget, originalLocation);
|
||||
}
|
||||
|
||||
@@ -68,7 +67,8 @@ void ChatWidgetHeader::mouseMoveEvent(QMouseEvent *event)
|
||||
}
|
||||
}
|
||||
|
||||
ChatWidget* ChatWidgetHeader::getChatWidget()
|
||||
ChatWidget *
|
||||
ChatWidgetHeader::getChatWidget()
|
||||
{
|
||||
return static_cast<ChatWidget*>(parentWidget());
|
||||
return static_cast<ChatWidget *>(parentWidget());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user