Fixed editor not showing after second view
This commit is contained in:
Binary file not shown.
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 677 KiB After Width: | Height: | Size: 677 KiB |
@@ -335,7 +335,12 @@ public class MapEditorDialog extends Dialog implements Disposable{
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Dialog show(){
|
public Dialog show(){
|
||||||
return super.show(Core.scene, Actions.sequence());
|
return super.show(Core.scene, Actions.sequence(Actions.alpha(1f)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void hide(){
|
||||||
|
super.hide(Actions.sequence(Actions.alpha(0f)));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -240,10 +240,6 @@ public class MapView extends Element implements GestureListener{
|
|||||||
editor.renderer().draw(centerx - sclwidth / 2, centery - sclheight / 2, sclwidth, sclheight);
|
editor.renderer().draw(centerx - sclwidth / 2, centery - sclheight / 2, sclwidth, sclheight);
|
||||||
Draw.reset();
|
Draw.reset();
|
||||||
|
|
||||||
if(!ScissorStack.pushScissors(rect.set(x, y, width, height))){
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(grid){
|
if(grid){
|
||||||
Draw.color(Color.GRAY);
|
Draw.color(Color.GRAY);
|
||||||
image.setBounds(centerx - sclwidth / 2, centery - sclheight / 2, sclwidth, sclheight);
|
image.setBounds(centerx - sclwidth / 2, centery - sclheight / 2, sclwidth, sclheight);
|
||||||
@@ -303,7 +299,6 @@ public class MapView extends Element implements GestureListener{
|
|||||||
Draw.reset();
|
Draw.reset();
|
||||||
|
|
||||||
ScissorStack.popScissors();
|
ScissorStack.popScissors();
|
||||||
ScissorStack.popScissors();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean active(){
|
private boolean active(){
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package io.anuke.mindustry.ui.fragments;
|
package io.anuke.mindustry.ui.fragments;
|
||||||
|
|
||||||
import io.anuke.arc.scene.Group;
|
import io.anuke.arc.scene.Group;
|
||||||
|
import io.anuke.arc.scene.actions.*;
|
||||||
import io.anuke.arc.scene.event.Touchable;
|
import io.anuke.arc.scene.event.Touchable;
|
||||||
import io.anuke.arc.scene.ui.Label;
|
import io.anuke.arc.scene.ui.Label;
|
||||||
import io.anuke.arc.scene.ui.TextButton;
|
import io.anuke.arc.scene.ui.TextButton;
|
||||||
@@ -44,11 +45,12 @@ public class LoadingFragment extends Fragment{
|
|||||||
public void show(String text){
|
public void show(String text){
|
||||||
table.<Label>find("namelabel").setText(text);
|
table.<Label>find("namelabel").setText(text);
|
||||||
table.visible(true);
|
table.visible(true);
|
||||||
|
table.getColor().a = 1f;
|
||||||
table.toFront();
|
table.toFront();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void hide(){
|
public void hide(){
|
||||||
table.visible(false);
|
table.toFront();
|
||||||
button.visible(false);
|
table.actions(Actions.fadeOut(1f), Actions.visible(false));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user