[Performous-commit] Tapio Vierros : Better scaling of joinmenu.

[Tapio V. <aa...@us...>]

Module: performous
Branch: master
Commit: 520ded594869d0d98b7f73ffc239ad890897422c

Author: Tapio Vierros <tap...@gm...>
Date:   Tue Aug 24 16:48:41 2010 +0300

Better scaling of joinmenu.

---

 game/instrumentgraph.cc |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/game/instrumentgraph.cc b/game/instrumentgraph.cc
index c4464b7..aba8e9b 100644
--- a/game/instrumentgraph.cc
+++ b/game/instrumentgraph.cc
@@ -68,13 +68,12 @@ void InstrumentGraph::drawMenu() {
 	ThemeInstrumentMenu& th = *m_menuTheme;
 	MenuOptions::const_iterator cur = static_cast<MenuOptions::const_iterator>(&m_menu.current());
 	glutil::PushMatrix pm; // Save scaling state
-	float s = m_width.get();
-	s = (s > 0.49f ? 1.0f : s + 0.3f); // Full scale with 1 or 2 instruments
+	double w = m_menu.dimensions.w();
+	const float s = std::min(m_width.get(), 0.5) / w;
 	glScalef(s, s, 1.0f);
 	// We need to multiply offset by inverse scale factor to keep it always constant
-	const double offsetX = 0.5f * (dimensions.x1() + dimensions.x2()) / s;
 	// All these vars are ultimately affected by the scaling matrix
-	double w = m_menu.dimensions.w();
+	const double offsetX = 0.5f * (dimensions.x1() + dimensions.x2()) / s;
 	const float txth = th.option.h();
 	const float button_margin = (getGraphType() == input::DANCEPAD ? 0.0f : 0.05f);
 	const float step = txth * 0.7f;