From 59611a4ad9d471a80e0210c6a3c75db84ffbd97f Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Sat, 8 Jun 2013 18:39:17 +0300 Subject: [PATCH] Changed default text/outline color (to white/black) to avoid confusion when adding a text into an empty scene. --- Source/TextOutputSource.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/TextOutputSource.cpp b/Source/TextOutputSource.cpp index 72ff1de2..2bfb4408 100644 --- a/Source/TextOutputSource.cpp +++ b/Source/TextOutputSource.cpp @@ -590,7 +590,7 @@ public: void UpdateSettings() { strFont = data->GetString(TEXT("font"), TEXT("Arial")); - color = data->GetInt(TEXT("color"), 0xFF000000); + color = data->GetInt(TEXT("color"), 0xFFFFFFFF); size = data->GetInt(TEXT("fontSize"), 48); opacity = data->GetInt(TEXT("textOpacity"), 100); scrollSpeed = data->GetInt(TEXT("scrollSpeed"), 0); @@ -611,7 +611,7 @@ public: baseSize.y = data->GetFloat(TEXT("baseSizeCY"), 100); bUseOutline = data->GetInt(TEXT("useOutline")) != 0; - outlineColor = data->GetInt(TEXT("outlineColor"), 0xFFFFFF); + outlineColor = data->GetInt(TEXT("outlineColor"), 0xFF000000); outlineSize = data->GetFloat(TEXT("outlineSize"), 2); outlineOpacity = data->GetInt(TEXT("outlineOpacity"), 100); @@ -813,7 +813,7 @@ INT_PTR CALLBACK ConfigureTextProc(HWND hwnd, UINT message, WPARAM wParam, LPARA //----------------------------------------- - CCSetColor(GetDlgItem(hwnd, IDC_COLOR), data->GetInt(TEXT("color"), 0xFF000000)); + CCSetColor(GetDlgItem(hwnd, IDC_COLOR), data->GetInt(TEXT("color"), 0xFFFFFFFF)); SendMessage(GetDlgItem(hwnd, IDC_TEXTOPACITY), UDM_SETRANGE32, 0, 100); SendMessage(GetDlgItem(hwnd, IDC_TEXTOPACITY), UDM_SETPOS32, 0, data->GetInt(TEXT("textOpacity"), 100)); @@ -846,7 +846,7 @@ INT_PTR CALLBACK ConfigureTextProc(HWND hwnd, UINT message, WPARAM wParam, LPARA SendMessage(GetDlgItem(hwnd, IDC_OUTLINETHICKNESS), UDM_SETRANGE32, 1, 20); SendMessage(GetDlgItem(hwnd, IDC_OUTLINETHICKNESS), UDM_SETPOS32, 0, data->GetInt(TEXT("outlineSize"), 2)); - CCSetColor(GetDlgItem(hwnd, IDC_OUTLINECOLOR), data->GetInt(TEXT("outlineColor"), 0xFFFFFFFF)); + CCSetColor(GetDlgItem(hwnd, IDC_OUTLINECOLOR), data->GetInt(TEXT("outlineColor"), 0xFF000000)); SendMessage(GetDlgItem(hwnd, IDC_OUTLINEOPACITY), UDM_SETRANGE32, 0, 100); SendMessage(GetDlgItem(hwnd, IDC_OUTLINEOPACITY), UDM_SETPOS32, 0, data->GetInt(TEXT("outlineOpacity"), 100));