comparison GUI/UI/UIPopup.cpp @ 2560:44d9df75dc13

Слияние
author Ritor1
date Thu, 14 May 2015 19:16:21 +0600
parents 91c75d202d30
children 30eb6dcac768
comparison
equal deleted inserted replaced
2559:6ab1273bc507 2560:44d9df75dc13
53 popup_window.uFrameHeight -= 12; 53 popup_window.uFrameHeight -= 12;
54 popup_window.uFrameZ = popup_window.uFrameX + popup_window.uFrameWidth - 1; 54 popup_window.uFrameZ = popup_window.uFrameX + popup_window.uFrameWidth - 1;
55 popup_window.uFrameW = popup_window.uFrameY + popup_window.uFrameHeight - 1; 55 popup_window.uFrameW = popup_window.uFrameY + popup_window.uFrameHeight - 1;
56 sprintf(pTmpBuf.data(), "\f%05d%s\f00000\n", ui_character_tooltip_header_default_color, Title); 56 sprintf(pTmpBuf.data(), "\f%05d%s\f00000\n", ui_character_tooltip_header_default_color, Title);
57 popup_window.DrawTitleText(pFontCreate, 0, 0, 0, pTmpBuf.data(), 3); 57 popup_window.DrawTitleText(pFontCreate, 0, 0, 0, pTmpBuf.data(), 3);
58 popup_window.DrawText(pFontSmallnum, 1, LOBYTE(pFontLucida->uFontHeight), 0, content, 0, 0, 0); 58 popup_window.DrawText(pFontSmallnum, 1, LOBYTE(pFontLucida->uFontHeight), 0, content, 0, popup_window.uFrameY + popup_window.uFrameHeight, 0);
59 } 59 }
60 60
61 //----- (004151D9) -------------------------------------------------------- 61 //----- (004151D9) --------------------------------------------------------
62 void __fastcall DrawPopupWindow(unsigned int uX, unsigned int uY, unsigned int uWidth, unsigned int uHeight) 62 void __fastcall DrawPopupWindow(unsigned int uX, unsigned int uY, unsigned int uWidth, unsigned int uHeight)
63 { 63 {