diff --git a/base/thread/thread_manager.h b/base/thread/thread_manager.h index 75b1ceda..cce267b6 100644 --- a/base/thread/thread_manager.h +++ b/base/thread/thread_manager.h @@ -9,18 +9,9 @@ #include "base/thread/framework_thread.h" #include "base/memory/singleton.h" -/** - * 一些预定义的线程 ID 值，提供开发者使用 - */ -enum ThreadIds -{ - kThreadMain, - kThreadDatabase, - kThreadGlobalMisc, -}; - namespace nbase { + class MessageLoop; class MessageLoopProxy; diff --git a/ui_components/cef_control/app/cef_js_bridge.cpp b/ui_components/cef_control/app/cef_js_bridge.cpp index 0b95d408..3bf5fd75 100644 --- a/ui_components/cef_control/app/cef_js_bridge.cpp +++ b/ui_components/cef_control/app/cef_js_bridge.cpp @@ -2,7 +2,7 @@ #include "cef_js_bridge.h" #include "ipc_string_define.h" -namespace nim_cef { +namespace nim_comp { CefJSBridge::CefJSBridge() { @@ -245,7 +245,7 @@ bool CefJSBridge::ExecuteCppCallbackFunc(int cpp_callback_id, const CefString& j auto callback = it->second; if (callback) { - nbase::ThreadManager::PostTask(kThreadMain, [=]() { callback(json_string); }); + nbase::ThreadManager::PostTask(kThreadUI, [=]() { callback(json_string); }); } // ִɺӻƳ @@ -291,7 +291,7 @@ bool CefJSBridge::ExecuteCppFunc(const CefString& function_name, const CefString if (it != browser_registered_function_.cend()) { auto function = it->second; - nbase::ThreadManager::PostTask(kThreadMain, [=]() { + nbase::ThreadManager::PostTask(kThreadUI, [=]() { function(params, [=](bool has_error, const std::string& json_result) { // Դ룬Ҫװ args->SetInt(0, js_callback_id); @@ -307,7 +307,7 @@ bool CefJSBridge::ExecuteCppFunc(const CefString& function_name, const CefString if (it != browser_registered_function_.cend()) { auto function = it->second; - nbase::ThreadManager::PostTask(kThreadMain, [=]() { + nbase::ThreadManager::PostTask(kThreadUI, [=]() { function(params, [=](bool has_error, const std::string& json_result) { // Դ룬Ҫװ args->SetInt(0, js_callback_id); diff --git a/ui_components/cef_control/app/cef_js_bridge.h b/ui_components/cef_control/app/cef_js_bridge.h index 6a6f7776..4d614698 100644 --- a/ui_components/cef_control/app/cef_js_bridge.h +++ b/ui_components/cef_control/app/cef_js_bridge.h @@ -2,7 +2,7 @@ #include "include/cef_app.h" #include "base/memory/singleton.h" -namespace nim_cef +namespace nim_comp { typedef std::function ReportResultFunction; diff --git a/ui_components/cef_control/app/client_app.cpp b/ui_components/cef_control/app/client_app.cpp index 3b624eb5..c9d3f904 100644 --- a/ui_components/cef_control/app/client_app.cpp +++ b/ui_components/cef_control/app/client_app.cpp @@ -9,7 +9,7 @@ #include "cef_control/manager/cef_manager.h" #include "cef_control/util/util.h" -namespace nim_cef +namespace nim_comp { ClientApp::ClientApp() diff --git a/ui_components/cef_control/app/client_app.h b/ui_components/cef_control/app/client_app.h index d8049c8c..8a9fa4d2 100644 --- a/ui_components/cef_control/app/client_app.h +++ b/ui_components/cef_control/app/client_app.h @@ -14,7 +14,7 @@ #include "include/cef_app.h" #include "cef_control/app/cef_js_bridge.h" -namespace nim_cef +namespace nim_comp { class ClientApp : public CefApp, public CefBrowserProcessHandler, diff --git a/ui_components/cef_control/app/client_app_browser.cpp b/ui_components/cef_control/app/client_app_browser.cpp index 387dad31..893360fe 100644 --- a/ui_components/cef_control/app/client_app_browser.cpp +++ b/ui_components/cef_control/app/client_app_browser.cpp @@ -7,7 +7,7 @@ #include "include/cef_v8.h" #include "cef_control/util/util.h" -namespace nim_cef +namespace nim_comp { ////////////////////////////////////////////////////////////////////////////////////////// // CefBrowserProcessHandler methods. diff --git a/ui_components/cef_control/app/client_app_render.cpp b/ui_components/cef_control/app/client_app_render.cpp index 3089e49b..46698d01 100644 --- a/ui_components/cef_control/app/client_app_render.cpp +++ b/ui_components/cef_control/app/client_app_render.cpp @@ -12,7 +12,7 @@ #include "cef_control/app/ipc_string_define.h" #include "cef_control/app/cef_js_bridge.h" -namespace nim_cef +namespace nim_comp { ////////////////////////////////////////////////////////////////////////////////////////// // CefRenderProcessHandler methods. diff --git a/ui_components/cef_control/app/ipc_string_define.h b/ui_components/cef_control/app/ipc_string_define.h index fcc29e1d..e7ec6098 100644 --- a/ui_components/cef_control/app/ipc_string_define.h +++ b/ui_components/cef_control/app/ipc_string_define.h @@ -6,7 +6,7 @@ */ #pragma once -namespace nim_cef +namespace nim_comp { static const char kFocusedNodeChangedMessage[] = "FocusedNodeChanged"; // webҳлȡԪظı static const char kExecuteCppCallbackMessage[] = "ExecuteCppCallback"; // ִ C++ Ϣص diff --git a/ui_components/cef_control/app/js_handler.cpp b/ui_components/cef_control/app/js_handler.cpp index eecd535a..e56e35c5 100644 --- a/ui_components/cef_control/app/js_handler.cpp +++ b/ui_components/cef_control/app/js_handler.cpp @@ -4,7 +4,7 @@ #include "cef_control/app/ipc_string_define.h" #include "cef_control/app/cef_js_bridge.h" -namespace nim_cef +namespace nim_comp { bool CefJSHandler::Execute(const CefString& name, CefRefPtr object, const CefV8ValueList& arguments, CefRefPtr& retval, CefString& exception) diff --git a/ui_components/cef_control/app/js_handler.h b/ui_components/cef_control/app/js_handler.h index d0a3fe4b..8bddbfd4 100644 --- a/ui_components/cef_control/app/js_handler.h +++ b/ui_components/cef_control/app/js_handler.h @@ -9,7 +9,7 @@ #include "include/cef_app.h" #include "cef_control/app/cef_js_bridge.h" -namespace nim_cef +namespace nim_comp { class CefJSHandler : public CefV8Handler diff --git a/ui_components/cef_control/control/cef_control.cpp b/ui_components/cef_control/control/cef_control.cpp index 6958ff07..fc8c8a41 100644 --- a/ui_components/cef_control/control/cef_control.cpp +++ b/ui_components/cef_control/control/cef_control.cpp @@ -2,8 +2,7 @@ #include "cef_control.h" #include "cef_control/util/util.h" -namespace ui -{ +namespace nim_comp { void CefControl::OnPaint(CefRefPtr browser, CefRenderHandler::PaintElementType type, const CefRenderHandler::RectList& dirtyRects, const std::string* buffer, int width, int height) { diff --git a/ui_components/cef_control/control/cef_control.h b/ui_components/cef_control/control/cef_control.h index 5ee57d6a..ca7c385f 100644 --- a/ui_components/cef_control/control/cef_control.h +++ b/ui_components/cef_control/control/cef_control.h @@ -8,8 +8,7 @@ #include "cef_control_base.h" #include "cef_control/util/memory_dc.h" -namespace ui -{ +namespace nim_comp { class CefControl :public CefControlBase, public IUIMessageFilter { diff --git a/ui_components/cef_control/control/cef_control_base.cpp b/ui_components/cef_control/control/cef_control_base.cpp index 4bc03703..df528150 100644 --- a/ui_components/cef_control/control/cef_control_base.cpp +++ b/ui_components/cef_control/control/cef_control_base.cpp @@ -2,8 +2,7 @@ #include "cef_control_base.h" #include "cef_control/util/util.h" -namespace ui -{ +namespace nim_comp { void CefControlBase::OnPaint(CefRefPtr browser, CefRenderHandler::PaintElementType type, const CefRenderHandler::RectList& dirtyRects, const std::string* buffer, int width, int height) { diff --git a/ui_components/cef_control/control/cef_control_base.h b/ui_components/cef_control/control/cef_control_base.h index 8ab51237..326b7af2 100644 --- a/ui_components/cef_control/control/cef_control_base.h +++ b/ui_components/cef_control/control/cef_control_base.h @@ -10,10 +10,11 @@ #include "cef_control/app/cef_js_bridge.h" #include "cef_control/handler/browser_handler.h" -namespace ui -{ +namespace nim_comp { -class CefControlBase : public Control, public nim_cef::BrowserHandler::HandlerDelegate +using namespace ui; + +class CefControlBase : public Control, public nim_comp::BrowserHandler::HandlerDelegate { public: CefControlBase(void); @@ -123,7 +124,7 @@ public: * @param[in] global_function Ƿһȫַ * @return true ʾעɹfalse Ѿע */ - bool RegisterCppFunc(const std::wstring& function_name, nim_cef::CppFunction function, bool global_function = false); + bool RegisterCppFunc(const std::wstring& function_name, nim_comp::CppFunction function, bool global_function = false); /** * @brief עһ C++ @@ -140,7 +141,7 @@ public: * @param[in] frame_name Ҫĸ frame µķĬʹ frame * @return true ʾɹãfalse ʾʧܣܲ */ - bool CallJSFunction(const std::wstring& js_function_name, const std::wstring& params, nim_cef::CallJsFunctionCallback callback, const std::wstring& frame_name = L""); + bool CallJSFunction(const std::wstring& js_function_name, const std::wstring& params, nim_comp::CallJsFunctionCallback callback, const std::wstring& frame_name = L""); /** * @brief һǰѾעõķ @@ -150,7 +151,7 @@ public: * @param[in] frame_id Ҫĸ ID frame µķĬʹ frame * @return true ʾɹãfalse ʾʧܣܲ */ - bool CallJSFunction(const std::wstring& js_function_name, const std::wstring& params, nim_cef::CallJsFunctionCallback callback, int frame_id); + bool CallJSFunction(const std::wstring& js_function_name, const std::wstring& params, nim_comp::CallJsFunctionCallback callback, int frame_id); /** * @brief ޸ @@ -413,8 +414,8 @@ private: virtual bool OnExecuteCppCallbackFunc(int cpp_callback_id, const CefString& json_string) OVERRIDE; protected: - CefRefPtr browser_handler_ = nullptr; - std::shared_ptr js_bridge_; + CefRefPtr browser_handler_ = nullptr; + std::shared_ptr js_bridge_; CefString url_; bool devtool_attached_; diff --git a/ui_components/cef_control/control/cef_control_base_ui.cpp b/ui_components/cef_control/control/cef_control_base_ui.cpp index fc324801..4c7018ab 100644 --- a/ui_components/cef_control/control/cef_control_base_ui.cpp +++ b/ui_components/cef_control/control/cef_control_base_ui.cpp @@ -7,8 +7,7 @@ #include "cef_control/manager/cef_manager.h" #include "cef_control/app/cef_js_bridge.h" -namespace ui -{ +namespace nim_comp { CefControlBase::CefControlBase(void) { @@ -179,7 +178,7 @@ CefString CefControlBase::GetMainURL(const CefString& url) return CefString(temp.c_str()); } -bool CefControlBase::RegisterCppFunc(const std::wstring& function_name, nim_cef::CppFunction function, bool global_function/* = false*/) +bool CefControlBase::RegisterCppFunc(const std::wstring& function_name, nim_comp::CppFunction function, bool global_function/* = false*/) { if (browser_handler_.get() && browser_handler_->GetBrowser().get() && js_bridge_.get()) { @@ -197,7 +196,7 @@ void CefControlBase::UnRegisterCppFunc(const std::wstring& function_name) } } -bool CefControlBase::CallJSFunction(const std::wstring& js_function_name, const std::wstring& params, nim_cef::CallJsFunctionCallback callback, const std::wstring& frame_name /*= L""*/) +bool CefControlBase::CallJSFunction(const std::wstring& js_function_name, const std::wstring& params, nim_comp::CallJsFunctionCallback callback, const std::wstring& frame_name /*= L""*/) { if (browser_handler_.get() && browser_handler_->GetBrowser().get() && js_bridge_.get()) { @@ -215,7 +214,7 @@ bool CefControlBase::CallJSFunction(const std::wstring& js_function_name, const return false; } -bool CefControlBase::CallJSFunction(const std::wstring& js_function_name, const std::wstring& params, nim_cef::CallJsFunctionCallback callback, int frame_id) +bool CefControlBase::CallJSFunction(const std::wstring& js_function_name, const std::wstring& params, nim_comp::CallJsFunctionCallback callback, int frame_id) { if (browser_handler_.get() && browser_handler_->GetBrowser().get() && js_bridge_.get()) { diff --git a/ui_components/cef_control/control/cef_control_ui.cpp b/ui_components/cef_control/control/cef_control_ui.cpp index b38be90c..b8dc533f 100644 --- a/ui_components/cef_control/control/cef_control_ui.cpp +++ b/ui_components/cef_control/control/cef_control_ui.cpp @@ -7,13 +7,12 @@ #include "cef_control/manager/cef_manager.h" #include "cef_control/app/cef_js_bridge.h" -namespace ui -{ - namespace - { -#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) -#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) - } +namespace nim_comp { + +namespace { + #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) + #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) +} CefControl::CefControl(void) { @@ -39,7 +38,7 @@ void CefControl::Init() { m_pWindow->AddMessageFilter(this); - browser_handler_ = new nim_cef::BrowserHandler; + browser_handler_ = new nim_comp::BrowserHandler; browser_handler_->SetHostWindow(m_pWindow->GetHWND()); browser_handler_->SetHandlerDelegate(this); ReCreateBrowser(); @@ -47,7 +46,7 @@ void CefControl::Init() if (!js_bridge_.get()) { - js_bridge_.reset(new nim_cef::CefJSBridge); + js_bridge_.reset(new nim_comp::CefJSBridge); } __super::Init(); @@ -280,7 +279,7 @@ bool CefControl::AttachDevTools(Control* control) { auto weak = view->GetWeakFlag(); auto task = [this, weak, view](){ - nbase::ThreadManager::PostTask(kThreadMain, ToWeakCallback([this, weak, view](){ + nbase::ThreadManager::PostTask(kThreadUI, ToWeakCallback([this, weak, view](){ if (weak.expired()) return; AttachDevTools(view); diff --git a/ui_components/cef_control/control/cef_native_control.cpp b/ui_components/cef_control/control/cef_native_control.cpp index 305c41fc..1e57299d 100644 --- a/ui_components/cef_control/control/cef_native_control.cpp +++ b/ui_components/cef_control/control/cef_native_control.cpp @@ -6,8 +6,7 @@ #include "cef_control/handler/browser_handler.h" #include "cef_control/manager/cef_manager.h" -namespace ui -{ +namespace nim_comp { CefNativeControl::CefNativeControl(void) { @@ -33,7 +32,7 @@ void CefNativeControl::Init() SetWindowLong(m_pWindow->GetHWND(), GWL_STYLE, style | WS_CLIPSIBLINGS | WS_CLIPCHILDREN); ASSERT((GetWindowExStyle(m_pWindow->GetHWND()) & WS_EX_LAYERED) == 0 && L"޷ڷֲ㴰ʹñؼ"); - browser_handler_ = new nim_cef::BrowserHandler; + browser_handler_ = new nim_comp::BrowserHandler; browser_handler_->SetHostWindow(m_pWindow->GetHWND()); browser_handler_->SetHandlerDelegate(this); ReCreateBrowser(); @@ -41,7 +40,7 @@ void CefNativeControl::Init() if (!js_bridge_.get()) { - js_bridge_.reset(new nim_cef::CefJSBridge); + js_bridge_.reset(new nim_comp::CefJSBridge); } __super::Init(); @@ -151,7 +150,7 @@ bool CefNativeControl::AttachDevTools(Control* /*view*/) { auto task = ToWeakCallback([this]() { - nbase::ThreadManager::PostTask(kThreadMain, ToWeakCallback([this](){ + nbase::ThreadManager::PostTask(kThreadUI, ToWeakCallback([this](){ AttachDevTools(nullptr); })); }); @@ -165,7 +164,7 @@ bool CefNativeControl::AttachDevTools(Control* /*view*/) CefBrowserSettings settings; windowInfo.width = 900; windowInfo.height = 700; - browser->GetHost()->ShowDevTools(windowInfo, new nim_cef::BrowserHandler, settings, CefPoint()); + browser->GetHost()->ShowDevTools(windowInfo, new nim_comp::BrowserHandler, settings, CefPoint()); devtool_attached_ = true; if (cb_devtool_visible_change_ != nullptr) cb_devtool_visible_change_(devtool_attached_); diff --git a/ui_components/cef_control/control/cef_native_control.h b/ui_components/cef_control/control/cef_native_control.h index 2ec0fd34..4ecab874 100644 --- a/ui_components/cef_control/control/cef_native_control.h +++ b/ui_components/cef_control/control/cef_native_control.h @@ -7,8 +7,9 @@ #pragma once #include "cef_control_base.h" -namespace ui -{ +namespace nim_comp { + +using namespace ui; class CefNativeControl : public CefControlBase { diff --git a/ui_components/cef_control/handler/browser_handler.cpp b/ui_components/cef_control/handler/browser_handler.cpp index 5c30169d..92d2dc80 100644 --- a/ui_components/cef_control/handler/browser_handler.cpp +++ b/ui_components/cef_control/handler/browser_handler.cpp @@ -6,7 +6,7 @@ #include "cef_control/app/ipc_string_define.h" #include "cef_control/app/cef_js_bridge.h" -namespace nim_cef +namespace nim_comp { BrowserHandler::BrowserHandler() { @@ -135,7 +135,7 @@ bool BrowserHandler::OnBeforePopup(CefRefPtr browser, void BrowserHandler::OnAfterCreated(CefRefPtr browser) { REQUIRE_UI_THREAD(); - nbase::ThreadManager::PostTask(kThreadMain, ToWeakCallback([this, browser](){ + nbase::ThreadManager::PostTask(kThreadUI, ToWeakCallback([this, browser](){ browser_list_.emplace_back(browser); if (browser_ != nullptr) browser_->GetHost()->WasHidden(true); @@ -167,7 +167,7 @@ bool BrowserHandler::DoClose(CefRefPtr browser) void BrowserHandler::OnBeforeClose(CefRefPtr browser) { REQUIRE_UI_THREAD(); - nbase::ThreadManager::PostTask(kThreadMain, ToWeakCallback([this, browser](){ + nbase::ThreadManager::PostTask(kThreadUI, ToWeakCallback([this, browser](){ CefManager::GetInstance()->SubBrowserCount(); auto it = std::find_if(browser_list_.begin(), browser_list_.end(), [&](const CefRefPtr& item){ return item->IsSame(browser); @@ -248,13 +248,13 @@ bool BrowserHandler::GetScreenPoint(CefRefPtr browser, int viewX, in void BrowserHandler::OnPopupShow(CefRefPtr browser, bool show) { if (handle_delegate_) - nbase::ThreadManager::PostTask(kThreadMain, nbase::Bind(&HandlerDelegate::OnPopupShow, handle_delegate_, browser, show)); + nbase::ThreadManager::PostTask(kThreadUI, nbase::Bind(&HandlerDelegate::OnPopupShow, handle_delegate_, browser, show)); } void BrowserHandler::OnPopupSize(CefRefPtr browser, const CefRect& rect) { if (handle_delegate_) - nbase::ThreadManager::PostTask(kThreadMain, nbase::Bind(&HandlerDelegate::OnPopupSize, handle_delegate_, browser, rect)); + nbase::ThreadManager::PostTask(kThreadUI, nbase::Bind(&HandlerDelegate::OnPopupSize, handle_delegate_, browser, rect)); } void BrowserHandler::OnPaint(CefRefPtr browser, @@ -273,7 +273,7 @@ void BrowserHandler::OnPaint(CefRefPtr browser, paint_buffer_.resize(buffer_length + 1); memcpy(&paint_buffer_[0], (char*)buffer, width * height * 4); - nbase::ThreadManager::PostTask(kThreadMain, nbase::Bind(&HandlerDelegate::OnPaint, handle_delegate_, browser, type, dirtyRects, &paint_buffer_, width, height)); + nbase::ThreadManager::PostTask(kThreadUI, nbase::Bind(&HandlerDelegate::OnPaint, handle_delegate_, browser, type, dirtyRects, &paint_buffer_, width, height)); } } @@ -338,14 +338,14 @@ void BrowserHandler::OnAddressChange(CefRefPtr browser, CefRefPtr browser, const CefString& title) { // Update the browser window title... if (handle_delegate_) - nbase::ThreadManager::PostTask(kThreadMain, nbase::Bind(&HandlerDelegate::OnTitleChange, handle_delegate_, browser, title)); + nbase::ThreadManager::PostTask(kThreadUI, nbase::Bind(&HandlerDelegate::OnTitleChange, handle_delegate_, browser, title)); } bool BrowserHandler::OnConsoleMessage(CefRefPtr browser, const CefString& message, const CefString& source, int line) @@ -360,28 +360,28 @@ void BrowserHandler::OnLoadingStateChange(CefRefPtr browser, bool is { // Update UI for browser state... if (handle_delegate_) - nbase::ThreadManager::PostTask(kThreadMain, nbase::Bind(&HandlerDelegate::OnLoadingStateChange, handle_delegate_, browser, isLoading, canGoBack, canGoForward)); + nbase::ThreadManager::PostTask(kThreadUI, nbase::Bind(&HandlerDelegate::OnLoadingStateChange, handle_delegate_, browser, isLoading, canGoBack, canGoForward)); } void BrowserHandler::OnLoadStart(CefRefPtr browser, CefRefPtr frame) { // A frame has started loading content... if (handle_delegate_) - nbase::ThreadManager::PostTask(kThreadMain, nbase::Bind(&HandlerDelegate::OnLoadStart, handle_delegate_, browser, frame)); + nbase::ThreadManager::PostTask(kThreadUI, nbase::Bind(&HandlerDelegate::OnLoadStart, handle_delegate_, browser, frame)); } void BrowserHandler::OnLoadEnd(CefRefPtr browser, CefRefPtr frame, int httpStatusCode) { // A frame has finished loading content... if (handle_delegate_) - nbase::ThreadManager::PostTask(kThreadMain, nbase::Bind(&HandlerDelegate::OnLoadEnd, handle_delegate_, browser, frame, httpStatusCode)); + nbase::ThreadManager::PostTask(kThreadUI, nbase::Bind(&HandlerDelegate::OnLoadEnd, handle_delegate_, browser, frame, httpStatusCode)); } void BrowserHandler::OnLoadError(CefRefPtr browser, CefRefPtr frame, ErrorCode errorCode, const CefString& errorText, const CefString& failedUrl) { // A frame has failed to load content... if (handle_delegate_) - nbase::ThreadManager::PostTask(kThreadMain, nbase::Bind(&HandlerDelegate::OnLoadError, handle_delegate_, browser, frame, errorCode, errorText, failedUrl)); + nbase::ThreadManager::PostTask(kThreadUI, nbase::Bind(&HandlerDelegate::OnLoadError, handle_delegate_, browser, frame, errorCode, errorText, failedUrl)); } bool BrowserHandler::OnJSDialog(CefRefPtr browser, const CefString& origin_url, const CefString& accept_lang, JSDialogType dialog_type, const CefString& message_text, const CefString& default_prompt_text, CefRefPtr callback, bool& suppress_message) @@ -424,7 +424,7 @@ CefRequestHandler::ReturnValue BrowserHandler::OnBeforeResourceLoad( void BrowserHandler::OnRenderProcessTerminated(CefRefPtr browser, TerminationStatus status) { if (handle_delegate_) - nbase::ThreadManager::PostTask(kThreadMain, nbase::Bind(&HandlerDelegate::OnRenderProcessTerminated, handle_delegate_, browser, status)); + nbase::ThreadManager::PostTask(kThreadUI, nbase::Bind(&HandlerDelegate::OnRenderProcessTerminated, handle_delegate_, browser, status)); } diff --git a/ui_components/cef_control/handler/browser_handler.h b/ui_components/cef_control/handler/browser_handler.h index 3c12ed48..767aeebb 100644 --- a/ui_components/cef_control/handler/browser_handler.h +++ b/ui_components/cef_control/handler/browser_handler.h @@ -10,7 +10,7 @@ #include "cef_control/util/auto_unregister.h" #include "cef_control/app/cef_js_bridge.h" -namespace nim_cef +namespace nim_comp { // BrowserHandler implements CefClient and a number of other interfaces. class BrowserHandler : diff --git a/ui_components/cef_control/manager/cef_manager.cpp b/ui_components/cef_control/manager/cef_manager.cpp index 201b5e06..c5e5b4d3 100644 --- a/ui_components/cef_control/manager/cef_manager.cpp +++ b/ui_components/cef_control/manager/cef_manager.cpp @@ -6,7 +6,7 @@ #include "cef_control/app/client_app.h" #include "cef_control/handler/browser_handler.h" -namespace nim_cef +namespace nim_comp { BOOL CefMessageLoopDispatcher::IsIdleMessage(const MSG* pMsg) @@ -173,7 +173,7 @@ void CefManager::PostQuitMessage(int nExitCode) // Ӧõٺٵ::PostQuitMessage if (browser_count_ == 0) { - nbase::ThreadManager::PostTask(kThreadMain, [nExitCode]() + nbase::ThreadManager::PostTask(kThreadUI, [nExitCode]() { ::PostQuitMessage(nExitCode); }); @@ -185,7 +185,7 @@ void CefManager::PostQuitMessage(int nExitCode) CefManager::GetInstance()->PostQuitMessage(nExitCode); }; - nbase::ThreadManager::PostDelayedTask(kThreadMain, cb, nbase::TimeDelta::FromMilliseconds(500)); + nbase::ThreadManager::PostDelayedTask(kThreadUI, cb, nbase::TimeDelta::FromMilliseconds(500)); } } diff --git a/ui_components/cef_control/manager/cef_manager.h b/ui_components/cef_control/manager/cef_manager.h index 5c47c8d2..1055ed99 100644 --- a/ui_components/cef_control/manager/cef_manager.h +++ b/ui_components/cef_control/manager/cef_manager.h @@ -7,7 +7,7 @@ #pragma once #include "include/cef_app.h" -namespace nim_cef +namespace nim_comp { /** @class CefMessageLoopDispatcher * @brief multi_threaded_message_loopΪfalseʱҪԼϢѭCefϢѭӿ diff --git a/ui_components/cef_control/util/auto_unregister.h b/ui_components/cef_control/util/auto_unregister.h index af7b7688..fdb84073 100644 --- a/ui_components/cef_control/util/auto_unregister.h +++ b/ui_components/cef_control/util/auto_unregister.h @@ -2,6 +2,8 @@ #include typedef std::function UnregisterCallback; +namespace nim_comp { + class AutoUnregister { public: @@ -64,3 +66,5 @@ public: private: std::unordered_map> element_list_; }; + +} diff --git a/ui_components/menu/ui_menu.cpp b/ui_components/menu/ui_menu.cpp index 8465ef70..b4b33914 100644 --- a/ui_components/menu/ui_menu.cpp +++ b/ui_components/menu/ui_menu.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "ui_menu.h" -namespace ui { +namespace nim_comp { ///////////////////////////////////////////////////////////////////////////////////// // diff --git a/ui_components/menu/ui_menu.h b/ui_components/menu/ui_menu.h index ef2582cf..f07d7df0 100644 --- a/ui_components/menu/ui_menu.h +++ b/ui_components/menu/ui_menu.h @@ -3,10 +3,9 @@ #pragma once -namespace ui -{ -///////////////////////////////////////////////////////////////////////////////////// -// +namespace nim_comp { + +using namespace ui; enum MenuAlignment { @@ -56,7 +55,7 @@ public: }; class ListContainerElement; -class CMenuElementUI : public ListContainerElement +class CMenuElementUI : public ui::ListContainerElement { friend CMenuWnd; public: @@ -66,6 +65,6 @@ public: virtual bool ButtonUp(EventArgs& msg) override; }; -} // namespace ui +} // namespace nim_comp #endif // __UIMENU_H__ diff --git a/ui_components/modal_wnd/async_do_modal.cpp b/ui_components/modal_wnd/async_do_modal.cpp index 36a898be..1aea7e85 100644 --- a/ui_components/modal_wnd/async_do_modal.cpp +++ b/ui_components/modal_wnd/async_do_modal.cpp @@ -2,6 +2,8 @@ #include "async_do_modal.h" #include "async_modal_runner.h" +namespace nim_comp { + bool AsyncDoModal(ModalWndBase *dlg) { return AsyncModalRunnerManager::GetInstance()->DoModal(dlg); @@ -10,4 +12,6 @@ bool AsyncDoModal(ModalWndBase *dlg) void CancelAllAsyncModalDialogs() { AsyncModalRunnerManager::GetInstance()->CancelAllThreads(); -} \ No newline at end of file +} + +} diff --git a/ui_components/modal_wnd/async_do_modal.h b/ui_components/modal_wnd/async_do_modal.h index 7ffd9971..a6f4632b 100644 --- a/ui_components/modal_wnd/async_do_modal.h +++ b/ui_components/modal_wnd/async_do_modal.h @@ -3,6 +3,8 @@ #include "modal_wnd_base.h" +namespace nim_comp { + // The function will create a helper thread and run a modal dialog on it. // Once the modal dialog ended, the thread will be destroyed automatically. // NOTE: Once this function is called, the ownership of |dlg| will be taken. @@ -13,4 +15,6 @@ bool AsyncDoModal(ModalWndBase *dlg); // Typically, the function should be called when the application wants to quit. void CancelAllAsyncModalDialogs(); +} + #endif // NIM_WIN_GUI_MSG_BOX_ASYNC_DO_MODAL_H_ diff --git a/ui_components/modal_wnd/async_modal_runner.cpp b/ui_components/modal_wnd/async_modal_runner.cpp index 56f89faf..64fbebcf 100644 --- a/ui_components/modal_wnd/async_modal_runner.cpp +++ b/ui_components/modal_wnd/async_modal_runner.cpp @@ -4,6 +4,8 @@ #include +namespace nim_comp { + static const char kModalThreadName[] = "AsyncModalRunner"; AsyncModalRunner::AsyncModalRunner(Delegate *delegate) @@ -102,7 +104,7 @@ void AsyncModalRunnerManager::CancelAllThreads() void AsyncModalRunnerManager::OnThreadWillExit(AsyncModalRunner *runner) { - nbase::ThreadManager::PostTask(kThreadMain, nbase::Bind(&AsyncModalRunnerManager::Deregister, this, runner)); + nbase::ThreadManager::PostTask(kThreadUI, nbase::Bind(&AsyncModalRunnerManager::Deregister, this, runner)); } void AsyncModalRunnerManager::Deregister(AsyncModalRunner *runner) @@ -121,3 +123,5 @@ void AsyncModalRunnerManager::Deregister(AsyncModalRunner *runner) // If the runner is found, // it will be destroyed out of the scope of the lock } + +} diff --git a/ui_components/modal_wnd/async_modal_runner.h b/ui_components/modal_wnd/async_modal_runner.h index 772f8a43..10706ccb 100644 --- a/ui_components/modal_wnd/async_modal_runner.h +++ b/ui_components/modal_wnd/async_modal_runner.h @@ -18,9 +18,10 @@ #ifndef NIM_WIN_GUI_MSG_BOX_ASYNC_MODAL_RUNNER_H_ #define NIM_WIN_GUI_MSG_BOX_ASYNC_MODAL_RUNNER_H_ - #include "modal_wnd_base.h" +namespace nim_comp { + class AsyncModalRunner : protected nbase::Thread { public: @@ -42,7 +43,7 @@ private: friend class AsyncModalRunnerManager; friend class std::shared_ptr; friend class std::_Ref_count; - + AsyncModalRunner(Delegate *delegate); virtual ~AsyncModalRunner(); @@ -76,4 +77,6 @@ private: std::list > runners_; }; +} + #endif //NIM_WIN_GUI_MSG_BOX_ASYNC_MODAL_RUNNER_H_ \ No newline at end of file diff --git a/ui_components/modal_wnd/file_dialog_ex.cpp b/ui_components/modal_wnd/file_dialog_ex.cpp index f629c7e5..43c9e480 100644 --- a/ui_components/modal_wnd/file_dialog_ex.cpp +++ b/ui_components/modal_wnd/file_dialog_ex.cpp @@ -6,6 +6,8 @@ #include "base/util/string_util.h" #include "base/file/file_util.h" +namespace nim_comp { + CFileDialogEx::CFileDialogEx(void) { memset(&m_szDefExt, 0, sizeof(m_szDefExt)); @@ -172,7 +174,7 @@ void CFileDialogEx::SyncShowModal() if (file_name.size() == 0) { StdClosure closure = nbase::Bind(file_dialog_callback2_, ret, file_directory); - nbase::ThreadManager::PostTask(kThreadMain, closure); + nbase::ThreadManager::PostTask(kThreadUI, closure); } else { @@ -182,7 +184,7 @@ void CFileDialogEx::SyncShowModal() if (nbase::FilePathIsExist(file_path, false)) { StdClosure closure = nbase::Bind(file_dialog_callback2_, ret, file_path); - nbase::ThreadManager::PostTask(kThreadMain, closure); + nbase::ThreadManager::PostTask(kThreadUI, closure); } get_length += file_name.size()+1; file_name = m_stOFN.lpstrFile + get_length; @@ -192,14 +194,14 @@ void CFileDialogEx::SyncShowModal() else { StdClosure closure = nbase::Bind(file_dialog_callback2_, ret, GetPathName()); - nbase::ThreadManager::PostTask(kThreadMain, closure); + nbase::ThreadManager::PostTask(kThreadUI, closure); } } else if (file_dialog_type_ == FDT_SaveFile) { BOOL ret = ::GetSaveFileName(&m_stOFN); StdClosure closure = nbase::Bind(file_dialog_callback2_, ret, GetPathName()); - nbase::ThreadManager::PostTask(kThreadMain, closure); + nbase::ThreadManager::PostTask(kThreadUI, closure); } else { @@ -278,4 +280,6 @@ std::wstring CFileDialogEx::GetNextPathName(POSITION& pos) pos = (POSITION)lpsz; return strPath; -} \ No newline at end of file +} + +} diff --git a/ui_components/modal_wnd/file_dialog_ex.h b/ui_components/modal_wnd/file_dialog_ex.h index be249a54..0c593b15 100644 --- a/ui_components/modal_wnd/file_dialog_ex.h +++ b/ui_components/modal_wnd/file_dialog_ex.h @@ -5,6 +5,8 @@ #include +namespace nim_comp { + struct __POSITION {}; typedef __POSITION* POSITION; @@ -58,4 +60,6 @@ private: FileDialogCallback2 file_dialog_callback2_; }; +} + #endif //_TOOL_FILE_DIALOGEX_H_ \ No newline at end of file diff --git a/ui_components/msgbox/msgbox.cpp b/ui_components/msgbox/msgbox.cpp index ecd75b3f..82b3cf37 100644 --- a/ui_components/msgbox/msgbox.cpp +++ b/ui_components/msgbox/msgbox.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "msgbox.h" +namespace nim_comp { using namespace ui; @@ -178,6 +179,8 @@ void MsgBox::EndMsgBox(MsgBoxRet ret) if (msgbox_callback_) { - nbase::ThreadManager::PostTask(kThreadMain, nbase::Bind(msgbox_callback_, ret)); + nbase::ThreadManager::PostTask(kThreadUI, nbase::Bind(msgbox_callback_, ret)); } } + +} diff --git a/ui_components/msgbox/msgbox.h b/ui_components/msgbox/msgbox.h index ca9c713a..d43e26c1 100644 --- a/ui_components/msgbox/msgbox.h +++ b/ui_components/msgbox/msgbox.h @@ -1,6 +1,8 @@ #pragma once #include "duilib/UIlib.h" +namespace nim_comp { + enum MsgBoxRet { MB_YES, @@ -57,3 +59,5 @@ private: MsgboxCallback msgbox_callback_; }; + +} diff --git a/ui_components/public_define.h b/ui_components/public_define.h new file mode 100644 index 00000000..77a83f27 --- /dev/null +++ b/ui_components/public_define.h @@ -0,0 +1,13 @@ +#ifndef _PUBLIC_DEFINE_H_ +#define _PUBLIC_DEFINE_H_ + +namespace nim_comp { + +enum ThreadId +{ + kThreadUI +}; + +} + +#endif // _PUBLIC_DEFINE_H_ \ No newline at end of file diff --git a/ui_components/shadow_wnd/shadow_wnd.cpp b/ui_components/shadow_wnd/shadow_wnd.cpp index 0daaefc0..5d7611e2 100644 --- a/ui_components/shadow_wnd/shadow_wnd.cpp +++ b/ui_components/shadow_wnd/shadow_wnd.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "shadow_wnd.h" -namespace ui { +namespace nim_comp { ShadowWnd::ShadowWnd() { diff --git a/ui_components/shadow_wnd/shadow_wnd.h b/ui_components/shadow_wnd/shadow_wnd.h index d2d1a0bc..1ff23045 100644 --- a/ui_components/shadow_wnd/shadow_wnd.h +++ b/ui_components/shadow_wnd/shadow_wnd.h @@ -5,9 +5,9 @@ #include "windows_manager/window_ex.h" -namespace ui { +namespace nim_comp { -using namespace nim_comp; +using namespace ui; /** @class ShadowWnd * @brief һӵΧĴڣ WS_EX_LAYERED ʵӰ diff --git a/ui_components/stdafx.h b/ui_components/stdafx.h index 0e2cb7c8..1dd82895 100644 --- a/ui_components/stdafx.h +++ b/ui_components/stdafx.h @@ -20,6 +20,9 @@ #include #include +// public define +#include "public_define.h" + // base #include "base/base.h" diff --git a/ui_components/toast/toast.cpp b/ui_components/toast/toast.cpp index a5148f16..3cbe0142 100644 --- a/ui_components/toast/toast.cpp +++ b/ui_components/toast/toast.cpp @@ -3,8 +3,8 @@ using namespace ui; -namespace shared -{ +namespace nim_comp { + const LPCTSTR Toast::kClassName = L"Toast"; void Toast::ShowToast(const std::wstring &content, int duration, HWND parent) @@ -90,7 +90,7 @@ void Toast::SetDuration(int duration) if (duration <= 0) return; - nbase::ThreadManager::PostDelayedTask(kThreadMain, ToWeakCallback([this]() + nbase::ThreadManager::PostDelayedTask(kThreadUI, ToWeakCallback([this]() { this->Close(); }), nbase::TimeDelta::FromMilliseconds(duration)); diff --git a/ui_components/toast/toast.h b/ui_components/toast/toast.h index f2b6a712..0d2a9f15 100644 --- a/ui_components/toast/toast.h +++ b/ui_components/toast/toast.h @@ -1,7 +1,6 @@ #pragma once -namespace shared -{ +namespace nim_comp { /** @class Toast * @brief ṩһ׵ʾ壬൱MessageBoxļ򻯰 * @copyright (c) 2016, NetEase Inc. All rights reserved diff --git a/ui_components/ui_components.vcxproj b/ui_components/ui_components.vcxproj index b752bff1..a423847c 100644 --- a/ui_components/ui_components.vcxproj +++ b/ui_components/ui_components.vcxproj @@ -107,7 +107,7 @@ ..\libs\;%(AdditionalLibraryDirectories) - nim_libcef_d.lib;libcef_dll_wrapper_d.lib;%(AdditionalDependencies) + %(AdditionalDependencies) /IGNORE:4006,4221 %(AdditionalOptions) @@ -128,7 +128,7 @@ ..\libs\x64\;%(AdditionalLibraryDirectories) - nim_libcef_d.lib;%(AdditionalDependencies) + %(AdditionalDependencies) /IGNORE:4006,4221 %(AdditionalOptions) @@ -153,7 +153,7 @@ ..\libs\;%(AdditionalLibraryDirectories) - nim_libcef.lib;%(AdditionalDependencies) + %(AdditionalDependencies) /IGNORE:4006,4221 %(AdditionalOptions) @@ -178,12 +178,13 @@ ..\libs\x64\;%(AdditionalLibraryDirectories) - nim_libcef.lib;%(AdditionalDependencies) + %(AdditionalDependencies) /IGNORE:4006,4221 %(AdditionalOptions) + diff --git a/ui_components/ui_components.vcxproj.filters b/ui_components/ui_components.vcxproj.filters index 1ad65660..d0ef58d5 100644 --- a/ui_components/ui_components.vcxproj.filters +++ b/ui_components/ui_components.vcxproj.filters @@ -132,6 +132,9 @@ cef_control\util + + 头文件 +