diff --git a/ECTrainer2/ECTrainer.h b/ECTrainer2/ECTrainer.h index fc5e269..fe83516 100644 --- a/ECTrainer2/ECTrainer.h +++ b/ECTrainer2/ECTrainer.h @@ -30,3 +30,4 @@ bool IsRunning() { return _Running; } void Stop() { _Running = false; } }; + diff --git a/ECTrainer2/ECTrainerGUI.cpp b/ECTrainer2/ECTrainerGUI.cpp index bfd97f3..26e48c0 100644 --- a/ECTrainer2/ECTrainerGUI.cpp +++ b/ECTrainer2/ECTrainerGUI.cpp @@ -23,16 +23,24 @@ // �h���񎦃E�C���h�E cv::namedWindow(WIN_DISP, cv::WINDOW_NORMAL | cv::WINDOW_OPENGL); if (_Displays.size() > 1) { + // ���C�����j�^�̌��� + int mainMonitor = 0, subMonitor = 1; + for (int i = 0; i < _Displays.size(); i++) { + if (_Displays[i].left == 0 && _Displays[i].top == 0) mainMonitor = i; + else subMonitor = i; + } // �}���`���j�^�̏ꍇ �T�u��ʂŃt���X�N���[���� - cv::moveWindow(WIN_DISP, _Displays[1].left, _Displays[1].top); + cv::moveWindow(WIN_DISP, _Displays[subMonitor].left, _Displays[subMonitor].top); cv::setWindowProperty(WIN_DISP, cv::WND_PROP_FULLSCREEN, cv::WINDOW_FULLSCREEN); - _DispBuffer.create(cv::Size(_Displays[1].right - _Displays[1].left, - _Displays[1].bottom - _Displays[1].top), CV_8UC3); + _DispBuffer.create(cv::Size(_Displays[subMonitor].right - _Displays[subMonitor].left, + _Displays[subMonitor].bottom - _Displays[subMonitor].top), CV_8UC3); + cv::moveWindow(WIN_MAIN, _Displays[mainMonitor].left + 100, _Displays[mainMonitor].top + 100); } else { // �V���O�����j�^�̏ꍇ cv::moveWindow(WIN_DISP, _Displays[0].left, _Displays[0].top); _DispBuffer.create(cv::Size(640, 480), CV_8UC3); + cv::moveWindow(WIN_MAIN, _Displays[0].left + 100, _Displays[0].top + 100); } cv::Mat opening = cv::imread("../images/ECTrainerLogo640x91.png"); SetDispBuffer(opening);