linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3045
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Wed 2012-09-12 20:50:31 +0200
message:
  Fix help tooltips in Windows 8
modified:
  changelog.txt
  win32/WinUtil.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 'changelog.txt'
--- changelog.txt	2012-09-10 22:14:27 +0000
+++ changelog.txt	2012-09-12 18:50:31 +0000
@@ -38,6 +38,7 @@
 * Merge 2 identical active mode settings (poy)
 * Fix NAT-PMP renewal (poy)
 * [L#226968] Remember list sorting & splitter positions (poy)
+* [L#1041553] Fix help tooltips in Windows 8 (poy)
 
 -- 0.799 2012-05-05 --
 * Add icons (iceman50)

=== modified file 'win32/WinUtil.cpp'
--- win32/WinUtil.cpp	2012-09-10 22:14:27 +0000
+++ win32/WinUtil.cpp	2012-09-12 18:50:31 +0000
@@ -954,6 +954,7 @@
 			seed.style |= ES_MULTILINE;
 		seed.exStyle = WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE | WS_EX_CLIENTEDGE;
 		seed.location.size.x = std::min(getParent()->getDesktopSize().width(), static_cast<long>(maxWidth * dwt::util::dpiFactor()));
+		seed.location.size.y = 1; // so that Rich Edit 8 sends EN_REQUESTRESIZE
 		seed.events |= ENM_REQUESTRESIZE;
 		create(seed);
 
@@ -967,9 +968,6 @@
 
 private:
 	LRESULT resize(LPARAM lParam, const tstring& text, dwt::Point pos) {
-		if(getVisible())
-			return 0;
-
 		dwt::Rectangle rect(reinterpret_cast<REQRESIZE*>(lParam)->rc);
 
 		if(rect.width() > getWindowRect().width() && !hasStyle(ES_MULTILINE)) {
@@ -1071,7 +1069,7 @@
 		// context-sensitive help
 		auto text = getHelpText(id);
 		if(text.first) {
-			new HelpPopup<true>(widget, Text::toT(getHelpText(id).second), pos);
+			new HelpPopup<true>(widget, Text::toT(text.second), pos);
 		}
 	}
 }