Skip to content

hiro/qt: Use QScreen for Monitor #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

hiro/qt: Use QScreen for Monitor #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions hiro/qt/monitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,23 @@
namespace hiro {

auto pMonitor::count() -> uint {
return QApplication::desktop()->screenCount();
return QApplication::screens().size();
}

auto pMonitor::dpi(uint monitor) -> Position {
//Qt does not support per-monitor DPI retrieval
return {
QApplication::desktop()->logicalDpiX(),
QApplication::desktop()->logicalDpiY()
QApplication::screens().at(monitor)->logicalDotsPerInchX(),
QApplication::screens().at(monitor)->logicalDotsPerInchY()
};
}

auto pMonitor::geometry(uint monitor) -> Geometry {
QRect rectangle = QApplication::desktop()->screenGeometry(monitor);
QRect rectangle = QApplication::screens().at(monitor)->geometry();
return {rectangle.x(), rectangle.y(), rectangle.width(), rectangle.height()};
}

auto pMonitor::primary() -> uint {
return QApplication::desktop()->primaryScreen();
return QApplication::screens().indexOf(QApplication::primaryScreen());
}

auto pMonitor::workspace(uint monitor) -> Geometry {
Expand Down
6 changes: 3 additions & 3 deletions hiro/qt/window.cpp
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ auto pWindow::handle() const -> uintptr_t {
}

auto pWindow::monitor() const -> uint {
int monitor = QDesktopWidget().screenNumber(qtWindow);
if(monitor < 0) monitor = Monitor::primary();
return monitor;
auto screen = qtWindow->window()->windowHandle()->screen();
if(screen == nullptr) return Monitor::primary();
return QApplication::screens().indexOf(screen);
}

auto pWindow::remove(sMenuBar menuBar) -> void {
Expand Down
Loading