-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve lag on startup when REToolSync doesn't connect
- Loading branch information
Showing
6 changed files
with
71 additions
and
77 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,39 +1,39 @@ | ||
#include "OverlayFrame.h" | ||
#include "ui_OverlayFrame.h" | ||
|
||
#include <QVBoxLayout> | ||
#include <QHBoxLayout> | ||
|
||
OverlayFrame* OverlayFrame::embed(QWidget* parent, bool visible) | ||
{ | ||
// TODO: confirm the memory management is correct | ||
auto frame = new OverlayFrame(parent); | ||
frame->setVisible(visible); | ||
auto hlayout = new QHBoxLayout(frame); | ||
hlayout->addWidget(frame); | ||
auto vlayout = new QVBoxLayout(parent); | ||
vlayout->addLayout(hlayout); | ||
return frame; | ||
} | ||
|
||
OverlayFrame::OverlayFrame(QWidget *parent) : | ||
QFrame(parent), | ||
ui(new Ui::OverlayFrame) | ||
{ | ||
ui->setupUi(this); | ||
} | ||
|
||
OverlayFrame::~OverlayFrame() | ||
{ | ||
delete ui; | ||
} | ||
|
||
QPushButton* OverlayFrame::button() | ||
{ | ||
return ui->pushButton; | ||
} | ||
|
||
QLabel* OverlayFrame::label() | ||
{ | ||
return ui->label; | ||
} | ||
#include "OverlayFrame.h" | ||
#include "ui_OverlayFrame.h" | ||
|
||
#include <QVBoxLayout> | ||
#include <QHBoxLayout> | ||
|
||
OverlayFrame* OverlayFrame::embed(QWidget* parent, bool visible) | ||
{ | ||
// TODO: confirm the memory management is correct | ||
auto frame = new OverlayFrame(parent); | ||
frame->setVisible(visible); | ||
auto hlayout = new QHBoxLayout(frame); | ||
hlayout->addWidget(frame); | ||
auto vlayout = new QVBoxLayout(parent); | ||
vlayout->addLayout(hlayout); | ||
return frame; | ||
} | ||
|
||
OverlayFrame::OverlayFrame(QWidget* parent) : | ||
QFrame(parent), | ||
ui(new Ui::OverlayFrame) | ||
{ | ||
ui->setupUi(this); | ||
} | ||
|
||
OverlayFrame::~OverlayFrame() | ||
{ | ||
delete ui; | ||
} | ||
|
||
QPushButton* OverlayFrame::button() | ||
{ | ||
return ui->pushButton; | ||
} | ||
|
||
QLabel* OverlayFrame::label() | ||
{ | ||
return ui->label; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,27 @@ | ||
#pragma once | ||
|
||
#include <QFrame> | ||
#include <QPushButton> | ||
#include <QLabel> | ||
|
||
namespace Ui { | ||
class OverlayFrame; | ||
} | ||
|
||
class OverlayFrame : public QFrame | ||
{ | ||
Q_OBJECT | ||
|
||
public: | ||
static OverlayFrame* embed(QWidget* parent, bool visible = true); | ||
|
||
explicit OverlayFrame(QWidget* parent = nullptr); | ||
~OverlayFrame(); | ||
|
||
QPushButton* button(); | ||
QLabel* label(); | ||
|
||
private: | ||
Ui::OverlayFrame* ui = nullptr; | ||
}; | ||
#pragma once | ||
|
||
#include <QFrame> | ||
#include <QPushButton> | ||
#include <QLabel> | ||
|
||
namespace Ui | ||
{ | ||
class OverlayFrame; | ||
} | ||
|
||
class OverlayFrame : public QFrame | ||
{ | ||
Q_OBJECT | ||
|
||
public: | ||
static OverlayFrame* embed(QWidget* parent, bool visible = true); | ||
|
||
explicit OverlayFrame(QWidget* parent = nullptr); | ||
~OverlayFrame(); | ||
|
||
QPushButton* button(); | ||
QLabel* label(); | ||
|
||
private: | ||
Ui::OverlayFrame* ui = nullptr; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters