linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2826
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Thu 2012-01-19 18:50:37 +0100
message:
  add borders around the splash screen text
modified:
  win32/SplashWindow.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'win32/SplashWindow.cpp'
--- win32/SplashWindow.cpp	2012-01-13 20:55:20 +0000
+++ win32/SplashWindow.cpp	2012-01-19 17:50:37 +0000
@@ -59,10 +59,13 @@
 
 void SplashWindow::operator()(const string& status) {
 	auto text = str(TF_("Loading DC++, please wait... (%1%)") % Text::toT(status));
-	auto textSize = getTextSize(text);
 
+	// set up sizes.
 	const long spacing = 6; // space between the icon and the text
+	const dwt::Point padding(4, 4); // padding borders around the text
+	const auto textSize = getTextSize(text) + padding + padding;
 	SIZE size = { std::max(iconSize, textSize.x), iconSize + spacing + textSize.y };
+	dwt::Rectangle textRect(std::max(iconSize - textSize.x, 0L) / 2, size.cy - textSize.y, textSize.x, textSize.y);
 
 	dwt::UpdateCanvas windowCanvas(this);
 	dwt::CompatibleCanvas canvas(windowCanvas.handle());
@@ -73,17 +76,22 @@
 	dwt::Bitmap bitmap(::CreateDIBSection(windowCanvas.handle(), &info, DIB_RGB_COLORS, &reinterpret_cast<void*&>(bits), 0, 0));
 	auto select(canvas.select(bitmap));
 
+	// draw the icon.
 	canvas.drawIcon(icon, dwt::Rectangle(std::max(textSize.x - iconSize, 0L) / 2, 0, iconSize, iconSize));
 
-	dwt::Rectangle textRect(std::max(iconSize - textSize.x, 0L) / 2, size.cy - textSize.y, textSize.x, textSize.y);
+	// draw text borders and fill the text background.
+	::RECT rc = textRect;
+	::DrawEdge(canvas.handle(), &rc, EDGE_BUMP, BF_RECT | BF_MIDDLE);
+
+	// draw the text.
 	auto bkMode(canvas.setBkMode(true));
-	canvas.fill(textRect, dwt::Brush(dwt::Brush::Window));
 	canvas.setTextColor(dwt::Color::predefined(COLOR_WINDOWTEXT));
 	auto selectFont(canvas.select(*getFont()));
-	canvas.drawText(text.c_str(), textRect, DT_LEFT | DT_TOP | DT_SINGLELINE | DT_NOPREFIX);
+	canvas.drawText(text.c_str(), textRect, DT_CENTER | DT_VCENTER | DT_SINGLELINE | DT_NOPREFIX);
+
 	// set bits within the text rectangle to not be transparent. rgbReserved is the alpha value.
-	for(long x = textRect.left(); x < textRect.right(); ++x) {
-		for(long y = textRect.top(); y < textRect.bottom(); ++y) {
+	for(long x = textRect.left(), xn = textRect.right(); x < xn; ++x) {
+		for(long y = textRect.top(), yn = textRect.bottom(); y < yn; ++y) {
 			bits[x + y * size.cx].rgbReserved = 255;
 		}
 	}