[OMPT-svn-commit] SF.net SVN: modplug:[1170] trunk/OpenMPT/mptrack

[<sag...@us...>]

Revision: 1170
          http://modplug.svn.sourceforge.net/modplug/?rev=1170&view=rev
Author:   saga-games
Date:     2012-02-01 19:09:36 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
[Fix] Setup dialog: Made WFIR type dropdown list non-editable.
[Fix] Pattern Editor: Fixed scrollbar update after change of number of channels (http://forum.openmpt.org/index.php?topic=3705.0).

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Draw_pat.cpp
    trunk/OpenMPT/mptrack/mptrack.rc

Modified: trunk/OpenMPT/mptrack/Draw_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Draw_pat.cpp	2012-01-29 01:09:04 UTC (rev 1169)
+++ trunk/OpenMPT/mptrack/Draw_pat.cpp	2012-02-01 19:09:36 UTC (rev 1170)
@@ -214,7 +214,7 @@
 void CViewPattern::UpdateView(DWORD dwHintMask, CObject *)
 //--------------------------------------------------------
 {
-	if (dwHintMask & HINT_MPTOPTIONS)
+	if(dwHintMask & HINT_MPTOPTIONS)
 	{
 		UpdateColors();
 		UpdateSizes();
@@ -222,25 +222,21 @@
 		InvalidatePattern(TRUE);
 		return;
 	}
-	if (dwHintMask & HINT_MODCHANNELS)
+	if(dwHintMask & HINT_MODCHANNELS)
 	{
 		InvalidateChannelsHeaders();
+		UpdateScrollSize();
 	}
-	//if (((dwHintMask & 0xFFFFFF) == HINT_PATTERNDATA) & (m_nPattern != (dwHintMask >> HINT_SHIFT_PAT))) return;
-	if ( (HintFlagPart(dwHintMask) == HINT_PATTERNDATA) && (m_nPattern != (dwHintMask >> HINT_SHIFT_PAT)) )
-			return;
+	if((HintFlagPart(dwHintMask) == HINT_PATTERNDATA) && (m_nPattern != (dwHintMask >> HINT_SHIFT_PAT)))
+		return;
 
-	if (dwHintMask & (HINT_MODTYPE|HINT_PATTERNDATA))
+	if(dwHintMask & (HINT_MODTYPE|HINT_PATTERNDATA))
 	{
 		InvalidatePattern(FALSE);
 	} else
-	if (dwHintMask & HINT_PATTERNROW)
+	if(dwHintMask & HINT_PATTERNROW)
 	{
-// -> CODE#0008
-// -> DESC"#define to set pattern max size (number of rows) limit (now set to 1024 instead of 256)"
-//		InvalidateRow(dwHintMask >> 24);
 		InvalidateRow(dwHintMask >> HINT_SHIFT_ROW);
-// -! BEHAVIOUR_CHANGE#0008
 	}
 
 }

Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc	2012-01-29 01:09:04 UTC (rev 1169)
+++ trunk/OpenMPT/mptrack/mptrack.rc	2012-02-01 19:09:36 UTC (rev 1170)
@@ -405,7 +405,7 @@
     LTEXT           "Resampling:",IDC_STATIC,18,182,42,8
     COMBOBOX        IDC_COMBO1,66,180,114,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "WFIR type:",IDC_STATIC,18,200,42,8
-    COMBOBOX        IDC_WFIRTYPE,66,198,114,64,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_WFIRTYPE,66,198,114,64,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "WFIR cutoff factor:",IDC_STATIC,18,219,63,8
     EDITTEXT        IDC_WFIRCUTOFF,156,216,24,14,ES_AUTOHSCROLL | ES_NUMBER
     LTEXT           "%",IDC_STATIC,186,219,8,8

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.