diff options
| author | JT Pennington <jt@obs-sec.com> | 2016-12-22 12:54:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-22 12:54:27 -0500 |
| commit | e78fefc9e727a93e33b48e2c5ee1b1a99f480242 (patch) | |
| tree | 33e6926989ea7c517426feebb89c366200da0fe0 /src-qt5/core/lumina-desktop/LPanel.h | |
| parent | fix pages.pri (diff) | |
| parent | Fix an issue with ZFS snapshot finding where the directory path of interest n... (diff) | |
| download | lumina-e78fefc9e727a93e33b48e2c5ee1b1a99f480242.tar.gz lumina-e78fefc9e727a93e33b48e2c5ee1b1a99f480242.tar.bz2 lumina-e78fefc9e727a93e33b48e2c5ee1b1a99f480242.zip | |
Merge branch 'master' into master
Diffstat (limited to 'src-qt5/core/lumina-desktop/LPanel.h')
| -rw-r--r-- | src-qt5/core/lumina-desktop/LPanel.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src-qt5/core/lumina-desktop/LPanel.h b/src-qt5/core/lumina-desktop/LPanel.h index 2828161c..bcea8eaf 100644 --- a/src-qt5/core/lumina-desktop/LPanel.h +++ b/src-qt5/core/lumina-desktop/LPanel.h @@ -38,13 +38,15 @@ private: //QRect hidegeom, showgeom; //for hidden panels QPoint hidepoint, showpoint; //for hidden panels: locations when hidden/visible bool defaultpanel, horizontal, hidden, hascompositer; - int screennum; + QString screenID; int panelnum; int viswidth, fullwidth; QList<LPPlugin*> PLUGINS; + int Screen(); //Turn the screenID into the appropriate number + public: - LPanel(QSettings *file, int 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); //settings file, screen number, panel number ~LPanel(); int number(){ |