aboutsummaryrefslogtreecommitdiff
path: root/src/win/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/win/gui')
-rw-r--r--src/win/gui/Clipboard.cpp17
-rw-r--r--src/win/gui/UiApplication.cpp7
-rw-r--r--src/win/gui/Window.cpp10
3 files changed, 13 insertions, 21 deletions
diff --git a/src/win/gui/Clipboard.cpp b/src/win/gui/Clipboard.cpp
index 7ecc9dea..6eab903c 100644
--- a/src/win/gui/Clipboard.cpp
+++ b/src/win/gui/Clipboard.cpp
@@ -1,5 +1,4 @@
#include "cru/win/gui/Clipboard.h"
-#include <winuser.h>
#include "cru/common/log/Logger.h"
#include "cru/win/gui/GodWindow.h"
#include "cru/win/gui/UiApplication.h"
@@ -14,25 +13,25 @@ String WinClipboard::GetText() {
auto god_window = application_->GetGodWindow();
if (!::OpenClipboard(god_window->GetHandle())) {
- log::Warn(u"Failed to open clipboard.");
+ CRU_LOG_WARN(u"Failed to open clipboard.");
return {};
}
if (!::IsClipboardFormatAvailable(CF_UNICODETEXT)) {
- log::Warn(u"Clipboard format for text is not available.");
+ CRU_LOG_WARN(u"Clipboard format for text is not available.");
return {};
}
auto handle = ::GetClipboardData(CF_UNICODETEXT);
if (handle == nullptr) {
- log::Warn(u"Failed to get clipboard data.");
+ CRU_LOG_WARN(u"Failed to get clipboard data.");
return {};
}
auto ptr = ::GlobalLock(handle);
if (ptr == nullptr) {
- log::Warn(u"Failed to lock clipboard data.");
+ CRU_LOG_WARN(u"Failed to lock clipboard data.");
::CloseClipboard();
return {};
}
@@ -49,21 +48,21 @@ void WinClipboard::SetText(String text) {
auto god_window = application_->GetGodWindow();
if (!::OpenClipboard(god_window->GetHandle())) {
- log::Warn(u"Failed to open clipboard.");
+ CRU_LOG_WARN(u"Failed to open clipboard.");
return;
}
auto handle = GlobalAlloc(GMEM_MOVEABLE, (text.size() + 1) * sizeof(wchar_t));
if (handle == nullptr) {
- log::Warn(u"Failed to allocate clipboard data.");
+ CRU_LOG_WARN(u"Failed to allocate clipboard data.");
::CloseClipboard();
return;
}
auto ptr = ::GlobalLock(handle);
if (ptr == nullptr) {
- log::Warn(u"Failed to lock clipboard data.");
+ CRU_LOG_WARN(u"Failed to lock clipboard data.");
::GlobalFree(handle);
::CloseClipboard();
return;
@@ -74,7 +73,7 @@ void WinClipboard::SetText(String text) {
::GlobalUnlock(handle);
if (::SetClipboardData(CF_UNICODETEXT, handle) == nullptr) {
- log::Warn(u"Failed to set clipboard data.");
+ CRU_LOG_WARN(u"Failed to set clipboard data.");
}
::CloseClipboard();
diff --git a/src/win/gui/UiApplication.cpp b/src/win/gui/UiApplication.cpp
index 8c2dfae7..1c9321b6 100644
--- a/src/win/gui/UiApplication.cpp
+++ b/src/win/gui/UiApplication.cpp
@@ -4,8 +4,6 @@
#include "WindowManager.h"
#include "cru/common/log/Logger.h"
#include "cru/platform/Check.h"
-#include "cru/win/DebugLogger.h"
-#include "cru/win/StdOutLogger.h"
#include "cru/win/graphics/direct/Factory.h"
#include "cru/win/gui/Base.h"
#include "cru/win/gui/Clipboard.h"
@@ -33,11 +31,6 @@ WinUiApplication::WinUiApplication() {
::SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE);
- log::Logger::GetInstance()->AddSource(
- std::make_unique<::cru::platform::win::WinDebugLoggerSource>());
- log::Logger::GetInstance()->AddSource(
- std::make_unique<::cru::platform::win::WinStdOutLoggerSource>());
-
graph_factory_ = std::make_unique<
cru::platform::graphics::win::direct::DirectGraphicsFactory>();
diff --git a/src/win/gui/Window.cpp b/src/win/gui/Window.cpp
index 9c86441e..cc2038ec 100644
--- a/src/win/gui/Window.cpp
+++ b/src/win/gui/Window.cpp
@@ -235,9 +235,9 @@ void WinNativeWindow::SetCursor(std::shared_ptr<ICursor> cursor) {
if (!::SetClassLongPtrW(hwnd_, GCLP_HCURSOR,
reinterpret_cast<LONG_PTR>(cursor_->GetHandle()))) {
CRU_LOG_WARN(
- u"Failed to set cursor because failed to set class long. Last "
- u"error code: {}.",
- ::GetLastError());
+ u"Failed to set cursor because failed to set class long. Last "
+ u"error code: {}.",
+ ::GetLastError());
return;
}
@@ -245,7 +245,7 @@ void WinNativeWindow::SetCursor(std::shared_ptr<ICursor> cursor) {
auto lg = [](StringView reason) {
CRU_LOG_WARN(
-
+
u"Failed to set cursor because {} when window is visible. (We need to "
u"update cursor if it is inside the window.) Last error code: {}.",
reason, ::GetLastError());
@@ -477,7 +477,7 @@ void WinNativeWindow::RecreateWindow() {
if (dpi == 0)
throw Win32Error(::GetLastError(), u"Failed to get dpi of window.");
dpi_ = static_cast<float>(dpi);
- log::Debug(u"Dpi of window is {}.", dpi_);
+ CRU_LOG_DEBUG(u"Dpi of window is {}.", dpi_);
window_manager->RegisterWindow(hwnd_, this);