no message

nutty898 · May 17, 2013 · d5cf637 · d5cf637
1 parent 0c4d6b4
commit d5cf637
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 9 deletions.
diff --git a/CocoGUILIB/CocoGUILIB/Component/CocoImageButton.cpp b/CocoGUILIB/CocoGUILIB/Component/CocoImageButton.cpp
diff --git a/CocoGUILIB/CocoGUILIB/Component/CocoImageButton.h b/CocoGUILIB/CocoGUILIB/Component/CocoImageButton.h
diff --git a/CocoGUILIB/CocoGUILIB/Component/CocoListView.cpp b/CocoGUILIB/CocoGUILIB/Component/CocoListView.cpp
diff --git a/CocoGUILIB/CocoGUILIB/Component/CocoListView.h b/CocoGUILIB/CocoGUILIB/Component/CocoListView.h
diff --git a/CocoGUILIB/CocoGUILIB/Component/CocoScrollView.cpp b/CocoGUILIB/CocoGUILIB/Component/CocoScrollView.cpp
@@ -968,7 +968,10 @@ namespace cs
 
         if (m_eMoveMode == SCROLLVIEW_MOVE_MODE_ACTION)
         {
-            stopAction();
+            if (isRunningAction)
+            {
+                stopAction();
+            }
         }
     }
 

diff --git a/CocoGUILIB/CocoGUILIB/Component/CocoScrollView.h b/CocoGUILIB/CocoGUILIB/Component/CocoScrollView.h
@@ -173,12 +173,12 @@ namespace cs
         bool m_bLeftEnd;
         bool m_bRightEnd;
 
-        bool m_bBerthToTop = false;
-        bool m_bBerthToBottom = false;
-        bool m_bBerthToLeft = false;
-        bool m_bBerthToRight = false;
-        bool m_bBerthToVerticalCenter = false;
-        bool m_bBerthToHorizontalCenter = false;
+        bool m_bBerthToTop;
+        bool m_bBerthToBottom;
+        bool m_bBerthToLeft;
+        bool m_bBerthToRight;
+        bool m_bBerthToVerticalCenter;
+        bool m_bBerthToHorizontalCenter;
 
         bool m_bAutoScroll;
 

diff --git a/CocoGUILIB/test/test/test/Resources/UIRES/CocoGUISample.json b/CocoGUILIB/test/test/test/Resources/UIRES/CocoGUISample.json
@@ -378,12 +378,12 @@
          "options" : {
          "x" : 240,
          "y" : 96,
-         "scale9Enable" : true,
+         "scale9Enable" : false,
          "normal" : "UIRES/backtotopnormal.png",
          "pressed" : "UIRES/backtotoppressed.png",
          "scale9Width" : 200,
          "scale9Height" : 100,
-         "imageScale9Enable" : true,
+         "imageScale9Enable" : false,
          "imageCapInsetsX" : 0,
          "imageCapInsetsY" : 0,
          "imageCapInsetsWidth" : 0,

diff --git a/CocoGUILIB/test/test/test/proj.win32/test.win32.vcxproj b/CocoGUILIB/test/test/test/proj.win32/test.win32.vcxproj
@@ -148,6 +148,7 @@
     <ClInclude Include="..\..\..\..\CocoGUILIB\CGraphics\GUINodeRGBA.h" />
     <ClInclude Include="..\..\..\..\CocoGUILIB\Component\CocoButton.h" />
     <ClInclude Include="..\..\..\..\CocoGUILIB\Component\CocoCheckBox.h" />
+    <ClInclude Include="..\..\..\..\CocoGUILIB\Component\CocoImageButton.h" />
     <ClInclude Include="..\..\..\..\CocoGUILIB\Component\CocoImageView.h" />
     <ClInclude Include="..\..\..\..\CocoGUILIB\Component\CocoLabel.h" />
     <ClInclude Include="..\..\..\..\CocoGUILIB\Component\CocoLabelAtlas.h" />
@@ -202,6 +203,7 @@
     <ClCompile Include="..\..\..\..\CocoGUILIB\CGraphics\GUINodeRGBA.cpp" />
     <ClCompile Include="..\..\..\..\CocoGUILIB\Component\CocoButton.cpp" />
     <ClCompile Include="..\..\..\..\CocoGUILIB\Component\CocoCheckBox.cpp" />
+    <ClCompile Include="..\..\..\..\CocoGUILIB\Component\CocoImageButton.cpp" />
     <ClCompile Include="..\..\..\..\CocoGUILIB\Component\CocoImageView.cpp" />
     <ClCompile Include="..\..\..\..\CocoGUILIB\Component\CocoLabel.cpp" />
     <ClCompile Include="..\..\..\..\CocoGUILIB\Component\CocoLabelAtlas.cpp" />

diff --git a/CocoGUILIB/test/test/test/proj.win32/test.win32.vcxproj.filters b/CocoGUILIB/test/test/test/proj.win32/test.win32.vcxproj.filters
@@ -235,6 +235,9 @@
     <ClInclude Include="..\..\..\..\CocoGUILIB\UIElements\UITextField.h">
       <Filter>CocoGUILIB\UIElements</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\CocoGUILIB\Component\CocoImageButton.h">
+      <Filter>CocoGUILIB\Component</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp">
@@ -366,5 +369,8 @@
     <ClCompile Include="..\..\..\..\CocoGUILIB\UIElements\UITextField.cpp">
       <Filter>CocoGUILIB\UIElements</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\CocoGUILIB\Component\CocoImageButton.cpp">
+      <Filter>CocoGUILIB\Component</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>