mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
remove ide.new.about registry key
This commit is contained in:
+1
-2
@@ -11,7 +11,6 @@ import com.intellij.openapi.util.BuildNumber;
|
||||
import com.intellij.openapi.util.JDOMUtil;
|
||||
import com.intellij.openapi.util.SystemInfo;
|
||||
import com.intellij.openapi.util.SystemInfoRt;
|
||||
import com.intellij.openapi.util.registry.Registry;
|
||||
import com.intellij.openapi.util.text.StringUtil;
|
||||
import com.intellij.ui.JBColor;
|
||||
import com.intellij.util.ArrayUtil;
|
||||
@@ -56,7 +55,7 @@ public class ApplicationInfoImpl extends ApplicationInfoEx {
|
||||
private int myProgressHeight = 2;
|
||||
private int myProgressX = 1;
|
||||
private int myProgressY = 350;
|
||||
private int myLicenseOffsetY = Registry.is("ide.new.about") ? 85 : 30;
|
||||
private int myLicenseOffsetY = 85;
|
||||
private String mySplashImageUrl;
|
||||
private String myAboutImageUrl;
|
||||
@SuppressWarnings("UseJBColor") private Color mySplashTextColor = new Color(0, 35, 135); // idea blue
|
||||
|
||||
@@ -128,10 +128,7 @@ public class Splash extends JDialog implements StartupProgress {
|
||||
mySplashIsVisible = true;
|
||||
}
|
||||
|
||||
int totalWidth = myImage.getIconWidth() - getProgressX();
|
||||
if (Registry.is("ide.new.about")) {
|
||||
totalWidth +=3;
|
||||
}
|
||||
int totalWidth = myImage.getIconWidth() - getProgressX() + 3;
|
||||
final int progressWidth = (int)(totalWidth * myProgress);
|
||||
final int width = progressWidth - myProgressLastPosition;
|
||||
g.setColor(color);
|
||||
@@ -177,14 +174,12 @@ public class Splash extends JDialog implements StartupProgress {
|
||||
g.setFont(UIUtil.getFontWithFallback(font));
|
||||
g.setColor(textColor);
|
||||
int offsetX = uiScale(15);
|
||||
int offsetY = 30;
|
||||
if (Registry.is("ide.new.about")) {
|
||||
if (info instanceof ApplicationInfoImpl) {
|
||||
offsetX = Math.max(offsetX, uiScale(((ApplicationInfoImpl)info).getProgressX()));
|
||||
offsetY = ((ApplicationInfoImpl)info).getLicenseOffsetY();
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
int offsetY;
|
||||
if (info instanceof ApplicationInfoImpl) {
|
||||
offsetX = Math.max(offsetX, uiScale(((ApplicationInfoImpl)info).getProgressX()));
|
||||
offsetY = ((ApplicationInfoImpl)info).getLicenseOffsetY();
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
|
||||
g.drawString(licensedToMessage, x + offsetX, y + height - uiScale(offsetY));
|
||||
@@ -199,7 +194,7 @@ public class Splash extends JDialog implements StartupProgress {
|
||||
|
||||
@NotNull
|
||||
protected static Font createFont(String name) {
|
||||
return new Font(name, Font.PLAIN, uiScale(Registry.is("ide.new.about") ? 12 : SystemInfo.isUnix ? 10 : 11));
|
||||
return new Font(name, Font.PLAIN, uiScale(12));
|
||||
}
|
||||
|
||||
private static final float JBUI_INIT_SCALE = JBUI.scale(1f);
|
||||
|
||||
@@ -1303,8 +1303,6 @@ trace.focus.on.app.activation=false
|
||||
trace.focus.on.app.activation.description=Focus tracing on application activation and deactivation
|
||||
trace.focus.on.app.restartRequired=false
|
||||
|
||||
ide.new.about=true
|
||||
|
||||
tests.assert.clear.read.only.status.outside.write.action=false
|
||||
tests.assert.clear.read.only.status.outside.write.action.description=FileModificationService and similar calls should be outside write action
|
||||
|
||||
|
||||
Reference in New Issue
Block a user