aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/desktop-utils
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2017-07-31 13:54:16 -0400
committerKen Moore <ken@ixsystems.com>2017-07-31 13:54:16 -0400
commit96252f4e5af25f24c4e7232cc42c077894e03370 (patch)
tree557dc9783acbedcb6710cd78a0b705b32e67555d /src-qt5/desktop-utils
parentAdd some commented-out code for changing theme engines (diff)
downloadlumina-96252f4e5af25f24c4e7232cc42c077894e03370.tar.gz
lumina-96252f4e5af25f24c4e7232cc42c077894e03370.tar.bz2
lumina-96252f4e5af25f24c4e7232cc42c077894e03370.zip
Fix the clearing of the QT_AUTO_SCREEN_SCALE_FACTOR variable on start of the screensaver
Diffstat (limited to 'src-qt5/desktop-utils')
-rw-r--r--src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp8
-rw-r--r--src-qt5/desktop-utils/lumina-screenshot/main.cpp2
2 files changed, 6 insertions, 4 deletions
diff --git a/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp b/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp
index 1cadd4f6..f9a54965 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp
+++ b/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp
@@ -229,6 +229,7 @@ bool MainUI::getWindow(){
void MainUI::getPixmap(){
QScreen *scrn = QApplication::screens().at(0);
QPixmap cpic;
+ qDebug() << "Grab Pixmap:" << cwin;
if( (cwin==0 && ui->radio_window->isChecked() ) || ui->radio_all->isChecked() ){
//Grab the whole screen
cpic = scrn->grabWindow(QApplication::desktop()->winId());
@@ -237,6 +238,7 @@ void MainUI::getPixmap(){
cpic = scrn->grabWindow(QApplication::desktop()->winId(), geom.x(), geom.y(), geom.width(), geom.height() );
}else if(cwin==0 && ui->radio_area->isChecked()){
//Grab the section of the screen which was selected
+ qDebug() << "Screen Area:" << snapArea;
cpic = scrn->grabWindow(QApplication::desktop()->winId(), snapArea.x(), snapArea.y(), snapArea.width(), snapArea.height() );
}else{
//Grab just the designated window
@@ -294,15 +296,15 @@ void MainUI::mouseReleaseEvent(QMouseEvent *ev){
QList<WId> wins = XCB->WindowList();
QList<WId> stack = XCB->WM_Get_Client_List(true);
cwin = 0;
- //qDebug() << "Try to select window:" << ev->globalPos();
+ qDebug() << "Try to select window:" << ev->globalPos() << ev->pos() << QCursor::pos();
for(int i=stack.length()-1; i>=0 && cwin==0; i--){ //work top->bottom in the stacking order
if(!wins.contains(stack[i])){ continue; }
if( XCB->WindowGeometry(stack[i], true).contains(ev->globalPos()) && XCB->WindowState(stack[i])!=LXCB::INVISIBLE ){
- //qDebug() << "Found Window:" << i << XCB->WindowClass(stack[i]);
+ qDebug() << "Found Window:" << i << XCB->WindowClass(stack[i]) << XCB->WindowGeometry(stack[i], true);
cwin = stack[i];
}
}
- //qDebug() << " - Got window:" << cwin;
+ qDebug() << " - Got window:" << cwin;
if(cwin==this->winId()){ return; } //cancelled
}
this->hide();
diff --git a/src-qt5/desktop-utils/lumina-screenshot/main.cpp b/src-qt5/desktop-utils/lumina-screenshot/main.cpp
index c5a9e2c5..e49599bf 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/main.cpp
+++ b/src-qt5/desktop-utils/lumina-screenshot/main.cpp
@@ -11,9 +11,9 @@
int main(int argc, char ** argv)
{
+ LTHEME::LoadCustomEnvSettings();
//Make sure Qt5 auto-scaling is disabled for this application (need exact pixel measurements)
unsetenv("QT_AUTO_SCREEN_SCALE_FACTOR");
- LTHEME::LoadCustomEnvSettings();
LSingleApplication a(argc, argv, "l-screenshot");
if(!a.isPrimaryProcess()){ return 0; }
//LuminaThemeEngine theme(&a);
bgstack15