SaneUI显示窗口时,parent为NULL时,居于屏幕中间
This commit is contained in:
parent
c1dd3f1028
commit
3a68cba829
|
@ -28,8 +28,11 @@ int show_srclist_ui(const char **manuNames, const char **sanePaths, HGWindow par
|
|||
if (!g_ownApplication)
|
||||
g_ownApplication = QMfcApp::pluginInstance(g_hInst);
|
||||
QWinWidget win(parent);
|
||||
if (nullptr != parent)
|
||||
{
|
||||
win.showCentered();
|
||||
qParent = &win;
|
||||
}
|
||||
#else
|
||||
qParent = parent;
|
||||
#endif
|
||||
|
@ -73,8 +76,11 @@ int show_devlist_ui(const SANEAPI* saneApi, const char **devNames, HGWindow pare
|
|||
if (!g_ownApplication)
|
||||
g_ownApplication = QMfcApp::pluginInstance(g_hInst);
|
||||
QWinWidget win(parent);
|
||||
if (nullptr != parent)
|
||||
{
|
||||
win.showCentered();
|
||||
qParent = &win;
|
||||
}
|
||||
#else
|
||||
qParent = parent;
|
||||
#endif
|
||||
|
@ -116,8 +122,11 @@ int show_setting_ui(const SANEAPI* saneApi, SANE_Handle handle, const char *devN
|
|||
if (!g_ownApplication)
|
||||
g_ownApplication = QMfcApp::pluginInstance(g_hInst);
|
||||
QWinWidget win(parent);
|
||||
if (nullptr != parent)
|
||||
{
|
||||
win.showCentered();
|
||||
qParent = &win;
|
||||
}
|
||||
#else
|
||||
qParent = parent;
|
||||
#endif
|
||||
|
@ -147,8 +156,11 @@ int show_scan_ui(const SANEAPI* saneApi, SANE_Handle handle, const char *devName
|
|||
if (!g_ownApplication)
|
||||
g_ownApplication = QMfcApp::pluginInstance(g_hInst);
|
||||
QWinWidget win(parent);
|
||||
if (nullptr != parent)
|
||||
{
|
||||
win.showCentered();
|
||||
qParent = &win;
|
||||
}
|
||||
#else
|
||||
qParent = parent;
|
||||
#endif
|
||||
|
@ -177,8 +189,11 @@ int show_msgbox_info(const char *title, const char *text, HGWindow parent)
|
|||
if (!g_ownApplication)
|
||||
g_ownApplication = QMfcApp::pluginInstance(g_hInst);
|
||||
QWinWidget win(parent);
|
||||
if (nullptr != parent)
|
||||
{
|
||||
win.showCentered();
|
||||
qParent = &win;
|
||||
}
|
||||
#else
|
||||
qParent = parent;
|
||||
#endif
|
||||
|
@ -197,8 +212,11 @@ int show_msgbox_warning(const char *title, const char *text, HGWindow parent)
|
|||
if (!g_ownApplication)
|
||||
g_ownApplication = QMfcApp::pluginInstance(g_hInst);
|
||||
QWinWidget win(parent);
|
||||
if (nullptr != parent)
|
||||
{
|
||||
win.showCentered();
|
||||
qParent = &win;
|
||||
}
|
||||
#else
|
||||
qParent = parent;
|
||||
#endif
|
||||
|
@ -218,8 +236,11 @@ int show_twain_srclist_ui(DSMENTRYPROC dsmProc, const TW_IDENTITY *appId, HGWind
|
|||
if (!g_ownApplication)
|
||||
g_ownApplication = QMfcApp::pluginInstance(g_hInst);
|
||||
QWinWidget win(parent);
|
||||
if (nullptr != parent)
|
||||
{
|
||||
win.showCentered();
|
||||
qParent = &win;
|
||||
}
|
||||
#else
|
||||
qParent = parent;
|
||||
#endif
|
||||
|
|
|
@ -83,7 +83,7 @@ QWinWidget::QWinWidget(CWnd *parentWnd, QObject *parent, Qt::WindowFlags f)
|
|||
|
||||
void QWinWidget::init()
|
||||
{
|
||||
Q_ASSERT(hParent);
|
||||
//Q_ASSERT(hParent);
|
||||
|
||||
if (hParent) {
|
||||
#if QT_VERSION >= 0x050000
|
||||
|
|
Loading…
Reference in New Issue