MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-92957

Browse Source
This commit is contained in:
Alexander Lobas
2012-11-12 14:59:30 +04:00
parent 181857e673
commit 8eedc006c2
3 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-designer/src/com/intellij/android/designer/designSurface/layout/actions/ResizeOperation.java
+13 -11
View File
@@ -215,22 +215,24 @@ public class ResizeOperation implements EditOperation {
myTextFeedback.dimension("dp");
}
}
else {
if (staticText.length() > 2) {
int index = staticText.length() - 2;
String dimension = staticText.substring(index);
if (ArrayUtil.indexOf(ResourceRenderer.DIMENSIONS, dimension) != -1) {
myTextFeedback.append(staticText.substring(0, index));
myTextFeedback.dimension(dimension);
}
else {
myTextFeedback.append(staticText);
}
else if (staticText.length() > 3 && staticText.endsWith("dip")) {
myTextFeedback.append(staticText.substring(0, staticText.length() - 3));
myTextFeedback.dimension("dip");
}
else if (staticText.length() > 2) {
int index = staticText.length() - 2;
String dimension = staticText.substring(index);
if (ArrayUtil.indexOf(ResourceRenderer.DIMENSIONS, dimension) != -1) {
myTextFeedback.append(staticText.substring(0, index));
myTextFeedback.dimension(dimension);
}
else {
myTextFeedback.append(staticText);
}
}
else {
myTextFeedback.append(staticText);
}
}
private static boolean snapToWidth(Rectangle bounds, Dimension size, int delta) {
plugins/android-designer/src/com/intellij/android/designer/propertyTable/editors/ResourceEditor.java
+1
View File
@@ -273,6 +273,7 @@ public class ResourceEditor extends PropertyEditor {
}
if (myIsDimension &&
!value.startsWith("@") &&
!value.endsWith("dip") &&
!value.equalsIgnoreCase("wrap_content") &&
!value.equalsIgnoreCase("fill_parent") &&
!value.equalsIgnoreCase("match_parent")) {
plugins/android-designer/src/com/intellij/android/designer/propertyTable/renderers/ResourceRenderer.java
+15 -6
View File
@@ -90,12 +90,21 @@ public class ResourceRenderer extends AbstractResourceRenderer {
myColoredComponent.append(value.substring(0, prefix), SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES);
myColoredComponent.append(value.substring(prefix), textStyle(component, value, system, colorValue));
}
else if (myFormats.contains(AttributeFormat.Dimension) && value.length() > 2) {
int index = value.length() - 2;
String dimension = value.substring(index);
if (ArrayUtil.indexOf(DIMENSIONS, dimension) != -1) {
myColoredComponent.append(value.substring(0, index));
myColoredComponent.append(dimension, SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES);
else if (myFormats.contains(AttributeFormat.Dimension)) {
if (value.length() > 3 && value.endsWith("dip")) {
myColoredComponent.append(value.substring(0, value.length() - 3));
myColoredComponent.append("dip", SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES);
}
else if (value.length() > 2) {
int index = value.length() - 2;
String dimension = value.substring(index);
if (ArrayUtil.indexOf(DIMENSIONS, dimension) != -1) {
myColoredComponent.append(value.substring(0, index));
myColoredComponent.append(dimension, SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES);
}
else {
myColoredComponent.append(value);
}
}
else {
myColoredComponent.append(value);