add close_ui API
This commit is contained in:
parent
8e0e64d7ae
commit
d33a26d64b
|
@ -1,4 +1,4 @@
|
||||||
|
|
||||||
|
|
||||||
#include "scanner.h"
|
#include "scanner.h"
|
||||||
|
|
||||||
|
@ -10,6 +10,7 @@
|
||||||
#include "sane_option_trans.h"
|
#include "sane_option_trans.h"
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
|
#include <twain_user/twainui.h>
|
||||||
|
|
||||||
#include "DlgSetting.h"
|
#include "DlgSetting.h"
|
||||||
#include "gb_json.h"
|
#include "gb_json.h"
|
||||||
|
@ -347,6 +348,7 @@ namespace callback
|
||||||
int (*show_setting_ui)(SANE_Handle device, HWND parent, LPSANEAPI api, const char* devname, bool with_scan, std::function<void(ui_result)> callback) = NULL;
|
int (*show_setting_ui)(SANE_Handle device, HWND parent, LPSANEAPI api, const char* devname, bool with_scan, std::function<void(ui_result)> callback) = NULL;
|
||||||
int (*show_progress_ui)(HWND parent, std::function<void(ui_result)> callback, std::function<void(int/*event*/, void*/*msg*/, int/*flag*/)>* notify) = NULL;
|
int (*show_progress_ui)(HWND parent, std::function<void(ui_result)> callback, std::function<void(int/*event*/, void*/*msg*/, int/*flag*/)>* notify) = NULL;
|
||||||
int (*show_messagebox_ui)(HWND parent, int event, void* msg, int flag) = NULL;
|
int (*show_messagebox_ui)(HWND parent, int event, void* msg, int flag) = NULL;
|
||||||
|
int (*close_ui)(int) = NULL;
|
||||||
|
|
||||||
|
|
||||||
static void init_ui(void)
|
static void init_ui(void)
|
||||||
|
@ -378,6 +380,7 @@ namespace callback
|
||||||
GET_API(show_setting_ui);
|
GET_API(show_setting_ui);
|
||||||
GET_API(show_progress_ui);
|
GET_API(show_progress_ui);
|
||||||
GET_API(show_messagebox_ui);
|
GET_API(show_messagebox_ui);
|
||||||
|
GET_API(close_ui);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3173,6 +3176,9 @@ COM_API_IMPLEMENT(scanner, void, ui_hide(void))
|
||||||
indicator_.reset();
|
indicator_.reset();
|
||||||
if (setting_.get())
|
if (setting_.get())
|
||||||
setting_.reset();
|
setting_.reset();
|
||||||
|
|
||||||
|
if (callback::close_ui)
|
||||||
|
callback::close_ui(UI_INDICATOR | UI_SETTING);
|
||||||
}
|
}
|
||||||
COM_API_IMPLEMENT(scanner, bool, ui_is_ok(void))
|
COM_API_IMPLEMENT(scanner, bool, ui_is_ok(void))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue