Browse Source

Fixed cursor bug when minimumsize and maximumsize were the same value

Dalton Nell 9 years ago
parent
commit
163f336872
2 changed files with 2 additions and 3 deletions
  1. 1
    2
      main.cpp
  2. 1
    1
      options.cpp

+ 1
- 2
main.cpp View File

75
     if ( maximumsize == minimumsize && w == maximumsize && h == maximumsize ) {
75
     if ( maximumsize == minimumsize && w == maximumsize && h == maximumsize ) {
76
         x = ex - maximumsize/2;
76
         x = ex - maximumsize/2;
77
         y = ey - maximumsize/2;
77
         y = ey - maximumsize/2;
78
-        xengine->setCursor( slop::Cross );
79
     }
78
     }
80
     *rsx = x;
79
     *rsx = x;
81
     *rsy = y;
80
     *rsy = y;
231
                 // We also detect which way the user is pulling and set the mouse icon accordingly.
230
                 // We also detect which way the user is pulling and set the mouse icon accordingly.
232
                 bool x = cx > xengine->m_mousex;
231
                 bool x = cx > xengine->m_mousex;
233
                 bool y = cy > xengine->m_mousey;
232
                 bool y = cy > xengine->m_mousey;
234
-                if ( selection->m_width <= 1 && selection->m_height <= 1 ) {
233
+                if ( selection->m_width <= 1 && selection->m_height <= 1 || minimumsize == maximumsize ) {
235
                     xengine->setCursor( slop::Cross );
234
                     xengine->setCursor( slop::Cross );
236
                 } else if ( !x && !y ) {
235
                 } else if ( !x && !y ) {
237
                     xengine->setCursor( slop::LowerRightCorner );
236
                     xengine->setCursor( slop::LowerRightCorner );

+ 1
- 1
options.cpp View File

3
 slop::Options* options = new slop::Options();
3
 slop::Options* options = new slop::Options();
4
 
4
 
5
 slop::Options::Options() {
5
 slop::Options::Options() {
6
-    m_version = "v2.0.9";
6
+    m_version = "v2.1.0";
7
     m_highlight = false;
7
     m_highlight = false;
8
     m_borderSize = 10;
8
     m_borderSize = 10;
9
     m_padding = 0;
9
     m_padding = 0;