← Back to team overview

linuxdcpp-team team mailing list archive

[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 2820: Fix missing tab icons

 

------------------------------------------------------------
revno: 2820
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sun 2012-01-15 14:52:55 +0100
message:
  Fix missing tab icons
modified:
  changelog.txt
  dwt/src/widgets/TabView.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-01-15 12:53:28 +0000
+++ changelog.txt	2012-01-15 13:52:55 +0000
@@ -8,6 +8,7 @@
 * [L#678432] Context-sensitive help tooltips in the settings dialog (poy)
 * [L#804993] Improve multiple monitor support (poy)
 * Propose a default nick using the Win user account name (poy)
+* [L#914457] Fix missing tab icons (poy)
 
 -- 0.791 2012-01-14 --
 * Update translations

=== modified file 'dwt/src/widgets/TabView.cpp'
--- dwt/src/widgets/TabView.cpp	2012-01-13 20:55:20 +0000
+++ dwt/src/widgets/TabView.cpp	2012-01-15 13:52:55 +0000
@@ -236,12 +236,13 @@
 	auto ti = getTabInfo(i);
 	if(ti) {
 		removeIcon(i);
-
-		ti->icon = icon;
+		ti->icon = 0;
 
 		TCITEM item = { TCIF_IMAGE };
 		item.iImage = icon ? addIcon(icon) : -1;
-		TabCtrl_SetItem(handle(), i, &item);
+		if(TabCtrl_SetItem(handle(), i, &item)) {
+			ti->icon = icon;
+		}
 
 		if(taskbar) {
 			setTaskbarIcon(w, icon);