From 8ddf03bc84ad9dbd007c45acb8f552e4fad3af10 Mon Sep 17 00:00:00 2001 From: Chulheon Date: Tue, 9 Jul 2013 11:50:42 +0900 Subject: [PATCH] fixed bug Change-Id: I3c0063454f8eee6336f72c88e26d61d8d8dedaa3 --- src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp b/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp index 12d1379..26d87e6 100644 --- a/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp +++ b/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp @@ -239,7 +239,7 @@ _EditCopyPasteMagnifier::OnDraw(void) Color editColor = __pCopyPasteManager->GetEdit()->GetColor(EDIT_STATUS_HIGHLIGHTED); if (editColor.GetAlpha() == 0x00) { - editColor.SetAlpha(0xFF); + editColor = Color::GetColor(COLOR_ID_WHITE); } Bitmap* pReplacedMaskBitmap = _BitmapImpl::GetColorReplacedBitmapN(*__pMagnifierMaskBitmap, Color::GetColor(COLOR_ID_MAGENTA), editColor); @@ -307,16 +307,16 @@ _EditCopyPasteMagnifier::CaptureTextArea(Canvas& canvas) r = bitmap.Construct(FloatRectangle(0, 0, captureBounds.width, captureBounds.height)); SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r)); - r = bitmap.Merge(FloatPoint(0.0f, 0.0f), *pOriginalBitmp, captureBounds); + r = bitmap.Merge(FloatPoint(0.0f, 0.0f), *pOriginalBitmp, CoordinateSystem::AlignToDevice(FloatRectangle(captureBounds.x, captureBounds.y, captureBounds.width, captureBounds.height))); SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r)); r = bitmap.SetScalingQuality(BITMAP_SCALING_QUALITY_HIGH); SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r)); - r = bitmap.Scale(FloatDimension(bitmap.GetWidth()*1.5f, bitmap.GetHeight()*1.5f)); + r = bitmap.Scale(CoordinateSystem::AlignToDevice(FloatDimension(bitmap.GetActualWidth()*1.5f, bitmap.GetActualHeight()*1.5f))); SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r)); - canvas.DrawBitmap(FloatPoint(capturePosX + adjustPoxX*1.5f, capturePosY + adjustPoxY*1.5f), bitmap); + canvas.DrawBitmap(CoordinateSystem::AlignToDevice(FloatPoint(capturePosX + adjustPoxX*1.5f, capturePosY + adjustPoxY*1.5f)), bitmap); delete pOriginalBitmp; -- 2.7.4