Merge branch 'master' of /home/ydeng/git/RhythmBullet
This commit is contained in:
		
							
								
								
									
										
											BIN
										
									
								
								android/assets/3840x2160/RhythmBulletMenuBG.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								android/assets/3840x2160/RhythmBulletMenuBG.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 452 KiB  | 
@@ -33,11 +33,10 @@ public class OptionsPage extends Page {
 | 
			
		||||
				targetPosition.x = 0.5f*Gdx.graphics.getWidth();
 | 
			
		||||
			}
 | 
			
		||||
		});
 | 
			
		||||
		backButton.setPosition(10, getHeightBelowTitle() + 5);
 | 
			
		||||
		addActor(backButton);
 | 
			
		||||
		backButton.setWidth(backButton.getWidth() + 20);
 | 
			
		||||
		addSpaceToTitle(backButton.getWidth() + backButton.getX() + 20);
 | 
			
		||||
		
 | 
			
		||||
		backButton.setPosition(getWidth() - backButton.getWidth() - 10, getHeightBelowTitle() + 5);
 | 
			
		||||
		addActor(backButton);
 | 
			
		||||
 | 
			
		||||
		optionsTable = new Table();
 | 
			
		||||
		optionsTable.defaults().center().space(10f);
 | 
			
		||||
		optionsTable.setSize(getWidth(), getHeight());
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,6 @@
 | 
			
		||||
package zero1hd.rhythmbullet.desktop.graphics.ui.pages;
 | 
			
		||||
 | 
			
		||||
import com.badlogic.gdx.Gdx;
 | 
			
		||||
import com.badlogic.gdx.graphics.g2d.Batch;
 | 
			
		||||
import com.badlogic.gdx.scenes.scene2d.Group;
 | 
			
		||||
import com.badlogic.gdx.scenes.scene2d.Touchable;
 | 
			
		||||
import com.badlogic.gdx.scenes.scene2d.ui.Label;
 | 
			
		||||
@@ -27,15 +26,6 @@ public class Page extends Group implements Disposable {
 | 
			
		||||
		return pageTitle.getY();
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	@Override
 | 
			
		||||
	public void draw(Batch batch, float parentAlpha) {
 | 
			
		||||
		super.draw(batch, parentAlpha);
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	public void addSpaceToTitle(float space) {
 | 
			
		||||
		pageTitle.moveBy(space, 0);
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	@Override
 | 
			
		||||
	public void dispose() {
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user