diff options
| author | Ken Moore <ken@ixsystems.com> | 2018-09-10 09:16:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-10 09:16:05 -0400 |
| commit | 04b9eff0297f23a186864e0a6a3ced5912cbbecc (patch) | |
| tree | 1c933b70d7746c5c44a1a80b9f73d26df0ba6127 | |
| parent | Make sure that the compositor process (compton) is properly watching/updating... (diff) | |
| parent | remove a duplicated item, and add a missing dependency 'libpoppler-qt5-dev' (diff) | |
| download | lumina-04b9eff0297f23a186864e0a6a3ced5912cbbecc.tar.gz lumina-04b9eff0297f23a186864e0a6a3ced5912cbbecc.tar.bz2 lumina-04b9eff0297f23a186864e0a6a3ced5912cbbecc.zip | |
Merge pull request #622 from chenliangomc/master
update class declaration
| -rw-r--r-- | port-files/debian/control | 2 | ||||
| -rw-r--r-- | src-qt5/core/lumina-desktop/LPanel.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/port-files/debian/control b/port-files/debian/control index d39b5199..cdd073bd 100644 --- a/port-files/debian/control +++ b/port-files/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9), qt5-qmake, qtbase5-dev, qtmultimedia5-dev, libx11-dev, libxrender-dev, libxcomposite-dev, libxdamage-dev, libxcb-icccm4-dev, libxcb-damage0-dev, libxcb-util0-dev, libqt5x11extras5-dev, qttools5-dev-tools, libxcb-image0-dev, - libxcb-composite0-dev, qtdeclarative5-dev, libqt5svg5-dev, + libpoppler-qt5-dev, qtdeclarative5-dev, libqt5svg5-dev, libxcb-xinput0-dev Standards-Version: 3.9.6 Homepage: https://github.com/trueos/lumina diff --git a/src-qt5/core/lumina-desktop/LPanel.h b/src-qt5/core/lumina-desktop/LPanel.h index 58e315b8..d9b7627c 100644 --- a/src-qt5/core/lumina-desktop/LPanel.h +++ b/src-qt5/core/lumina-desktop/LPanel.h @@ -37,7 +37,7 @@ private: QWidget *bgWindow, *panelArea; //QRect hidegeom, showgeom; //for hidden panels QPoint hidepoint, showpoint; //for hidden panels: locations when hidden/visible - bool defaultpanel, horizontal, hidden, hascompositer; + bool defaultpanel, horizontal, hidden, hascompositer, reserveloc; QString screenID; int panelnum; int viswidth, fullwidth; @@ -47,7 +47,7 @@ private: int Screen(); //Turn the screenID into the appropriate number public: - LPanel(QSettings *file, QString scr = 0, int num =0, QWidget *parent=0); //settings file, screen number, panel number + LPanel(QSettings *file, QString scr = 0, int num = 0, QWidget *parent = 0, bool reservespace = true); //settings file, screen number, panel number ~LPanel(); int number(){ |