Project

General

Profile

« Previous | Next » 

Revision a42e25a6

Added by Leszek Koltunski about 4 years ago

Bugfixes.

View differences:

src/main/java/org/distorted/uistate/RubikStatePlay.java
116 116
      @Override
117 117
      public void onClick(View view)
118 118
        {
119
        int total = RubikObjectList.getTotal();
120
        boolean vertical = act.isVertical();
121
        mLayout.setOrientation(vertical ? LinearLayout.VERTICAL:LinearLayout.HORIZONTAL);
119
        if( act.getPostRender().canPlay() )
120
          {
121
          int total = RubikObjectList.getTotal();
122
          boolean vertical = act.isVertical();
123
          mLayout.setOrientation(vertical ? LinearLayout.VERTICAL:LinearLayout.HORIZONTAL);
122 124

  
123
        int height = view.getHeight();
124
        int width  = view.getWidth();
125
        int laywid = mLayoutWidth * (vertical? 1:total);
126
        int layhei = mLayoutHeight* (vertical? total:1);
125
          int height = view.getHeight();
126
          int width  = view.getWidth();
127
          int laywid = mLayoutWidth * (vertical? 1:total);
128
          int layhei = mLayoutHeight* (vertical? total:1);
127 129

  
128
        mPopup.showAsDropDown(view, (width-laywid)/2, -height-layhei, Gravity.LEFT);
130
          mPopup.showAsDropDown(view, (width-laywid)/2, -height-layhei, Gravity.LEFT);
131
          }
129 132
        }
130 133
      });
131 134
    }
......
146 149
      @Override
147 150
      public void onClick(View v)
148 151
        {
149
        RubikState.goBack(act);
152
        if( act.getPostRender().canPlay() ) RubikState.goBack(act);
150 153
        }
151 154
      });
152 155
    }
......
195 198
          @Override
196 199
          public void onClick(View v)
197 200
            {
198
            mObject = obj;
199
            mSize   = sizes[size];
200
            act.changeObject(list,sizes[size],null);
201
            if( act.getPostRender().canPlay() && RubikState.getCurrentState()==RubikState.PLAY )
202
              {
203
              mObject = obj;
204
              mSize   = sizes[size];
205
              act.changeObject(list,sizes[size],null);
206
              }
201 207
            mPopup.dismiss();
202 208
            }
203 209
          });

Also available in: Unified diff