diff --git "a/\346\231\272\347\273\230\346\225\231/IdtDrawpad.cpp" "b/\346\231\272\347\273\230\346\225\231/IdtDrawpad.cpp" index f6d78fd..fa46aa1 100644 --- "a/\346\231\272\347\273\230\346\225\231/IdtDrawpad.cpp" +++ "b/\346\231\272\347\273\230\346\225\231/IdtDrawpad.cpp" @@ -634,7 +634,7 @@ int test_main() dwords_rect.left = 0; dwords_rect.top = 305; dwords_rect.right = 800; - dwords_rect.bottom = 700; + dwords_rect.bottom = 630; } wstring text = L"����汾��" + string_to_wstring(edition_code); @@ -659,63 +659,20 @@ int test_main() if (!server_updata_error_reason.empty()) text += L"\n" + server_updata_error_reason; } - /* - GetCursorPos(&pt); - - text += L"\n\n���������£�"; - text += KEY_DOWN(VK_LBUTTON) ? L"��" : L"��"; - text += L"\n������� " + to_wstring(pt.x) + L"," + to_wstring(pt.y); - - text += L"\n\n�˳���ʹ�� RealTimeStylus ���ؿ⣨���Դ�������뻭��ģʽ��"; - text += L"\n����� WinXP �����ϰ汾��ϵͳ��Ч�ʽϸߣ�֧�ֶ�㴥��"; - - if (uRealTimeStylus == 2) text += L"\n\nRealTimeStylus ��Ϣ������"; - else if (uRealTimeStylus == 3) text += L"\n\nRealTimeStylus ��Ϣ��̧��"; - else if (uRealTimeStylus == 4) text += L"\n\nRealTimeStylus ��Ϣ���ƶ�"; - else text += L"\n\nRealTimeStylus ��Ϣ������"; - - text += L"\n���ذ��£�"; - text += touchDown ? L"��" : L"��"; - text += L"\n���´��ص�������"; - text += to_wstring(touchNum); + graphics.DrawString(text.c_str(), -1, &gp_font, hiex::RECTToRectF(dwords_rect), &stringFormat, &WordBrush); - for (int i = 0; i < 20; i++) { - if (touchNum > i) + Gdiplus::Font gp_font(&HarmonyOS_fontFamily, 18, FontStyleRegular, UnitPixel); + SolidBrush WordBrush(hiex::ConvertToGdiplusColor(RGB(6, 39, 182), false)); + graphics.SetTextRenderingHint(TextRenderingHintAntiAliasGridFit); { - pt = TouchPos[TouchList[i]].pt; - text += L"\n���ص�" + to_wstring(i + 1) + L" pid" + to_wstring(TouchList[i]) + L" ���� " + to_wstring(pt.x) + L"," + to_wstring(pt.y); + dwords_rect.left = 0; + dwords_rect.top = 630; + dwords_rect.right = 800; + dwords_rect.bottom = 700; } - else break; + graphics.DrawString(L"����������ϵ��ʽ\nQQ: 2685549821\ne-mail: alan-crl@foxmail.com", -1, &gp_font, hiex::RECTToRectF(dwords_rect), &stringFormat, &WordBrush); } - - text += L"\n\nTouchList "; - for (const auto& val : TouchList) - { - text += to_wstring(val) + L" "; - } - text += L"\nTouchTemp "; - for (size_t i = 0; i < TouchTemp.size(); ++i) - { - text += to_wstring(TouchTemp[i].pid) + L" "; - } - - text += L"\n\n���ؿ⵱ǰ��С��" + to_wstring(max(0, int(RecallImage.size()) - 1)); - - text += L"\n\nCOM�����ƽӿ� ������� ״̬��\n"; - text += ppt_LinkTest; - text += L"\nPPT �������״̬��"; - text += ppt_IsPptDependencyLoaded; - - text += L"\n\nPPT ״̬��"; - text += ppt_info_stay.TotalPage != -1 ? L"���ڲ���" : L"δ����"; - text += L"\nPPT ��ҳ������"; - text += to_wstring(ppt_info_stay.TotalPage); - text += L"\nPPT ��ǰҳ��ţ�"; - text += to_wstring(ppt_info_stay.CurrentPage); - */ - - graphics.DrawString(text.c_str(), -1, &gp_font, hiex::RECTToRectF(dwords_rect), &stringFormat, &WordBrush); } //����