Author: mir3x
Date: Mon Dec 28 10:11:16 2015
New Revision: 31239
URL: http://svn.gna.org/viewcvs/freeciv?rev=31239&view=rev
Log:
Fixed 'overlapping' tax indicators.
See bug #24229
Modified:
branches/S2_5/client/gui-qt/mapview.cpp
Modified: branches/S2_5/client/gui-qt/mapview.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/mapview.cpp?rev=31239&r1=31238&r2=31239&view=diff
==============================================================================
--- branches/S2_5/client/gui-qt/mapview.cpp (original)
+++ branches/S2_5/client/gui-qt/mapview.cpp Mon Dec 28 10:11:16 2015
@@ -1146,7 +1146,8 @@
tax_indicators[d]->setToolTip(_("Shows your current luxury/science/tax "
"rates. Use mouse wheel to change them"));
}
- setMinimumWidth(get_tax_sprite(tileset, O_LUXURY)->pm->height() + 10 + 25);
+ setMinimumWidth(qMax(get_tax_sprite(tileset, O_LUXURY)->pm->width() * 10
+ + 25, fm.width(etb_button->text())));
setMinimumHeight(fm.height() + client_research_sprite()->pm->height()
+ get_tax_sprite(tileset, O_LUXURY)->pm->height() + 25);
updateGeometry();
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
