Skip to content

Commit 9266861

Browse files
committed
CATROID-1417 Bug fixed where visual placement is skipped
1 parent 24737be commit 9266861

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

catroid/src/main/java/org/catrobat/catroid/visualplacement/VisualPlacementActivity.java

+10-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Catroid: An on-device visual programming system for Android devices
3-
* Copyright (C) 2010-2021 The Catrobat Team
3+
* Copyright (C) 2010-2022 The Catrobat Team
44
* (<http://developer.catrobat.org/credits>)
55
*
66
* This program is free software: you can redistribute it and/or modify
@@ -37,6 +37,7 @@
3737
import android.graphics.drawable.BitmapDrawable;
3838
import android.graphics.drawable.Drawable;
3939
import android.os.Bundle;
40+
import android.util.DisplayMetrics;
4041
import android.view.Gravity;
4142
import android.view.Menu;
4243
import android.view.MenuItem;
@@ -50,7 +51,6 @@
5051

5152
import org.catrobat.catroid.ProjectManager;
5253
import org.catrobat.catroid.R;
53-
import org.catrobat.catroid.common.ScreenValues;
5454
import org.catrobat.catroid.content.Project;
5555
import org.catrobat.catroid.content.Sprite;
5656
import org.catrobat.catroid.ui.BaseCastActivity;
@@ -149,7 +149,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
149149

150150
@Override
151151
protected void onCreate(@Nullable Bundle savedInstanceState) {
152-
super.onCreate(savedInstanceState);
152+
super.onCreate(null);
153+
DisplayMetrics displayMetrics = new DisplayMetrics();
154+
getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
155+
int height = displayMetrics.heightPixels;
156+
int width = displayMetrics.widthPixels;
153157

154158
if (isFinishing()) {
155159
return;
@@ -189,13 +193,13 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
189193

190194
frameLayout = findViewById(R.id.frame_container);
191195

192-
int screenWidth = ScreenValues.SCREEN_WIDTH;
193-
int screenHeight = ScreenValues.SCREEN_HEIGHT;
196+
int screenWidth = width;
197+
int screenHeight = height;
194198
int virtualScreenWidth = currentProject.getXmlHeader().virtualScreenWidth;
195199
int virtualScreenHeight = currentProject.getXmlHeader().virtualScreenHeight;
196200

197201
float aspectRatio = (float) virtualScreenWidth / (float) virtualScreenHeight;
198-
float screenAspectRatio = ScreenValues.getAspectRatio();
202+
float screenAspectRatio = (float) width / (float) height;
199203

200204
float scale;
201205
float ratioHeight = (float) screenHeight / (float) virtualScreenHeight;

0 commit comments

Comments
 (0)