Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Intellij Community
Commits
e12d3337
Commit
e12d3337
authored
6 years ago
by
Konstantin Bulenkov
1
Browse files
Options
Download
Email Patches
Plain Diff
fix exception on start and falling lightbeam tests
parent
8dbba102
Branches unavailable
Tags unavailable
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
platform/platform-api/src/com/intellij/ide/ui/UITheme.java
+2
-3
platform/platform-api/src/com/intellij/ide/ui/UITheme.java
with
2 additions
and
3 deletions
+2
-3
platform/platform-api/src/com/intellij/ide/ui/UITheme.java
+
2
-
3
View file @
e12d3337
...
...
@@ -109,6 +109,8 @@ public class UITheme {
if
(
"null"
.
equals
(
value
))
{
return
null
;
}
if
(
"true"
.
equals
(
value
))
return
Boolean
.
TRUE
;
if
(
"false"
.
equals
(
value
))
return
Boolean
.
FALSE
;
if
(
key
.
endsWith
(
"Insets"
)
||
key
.
endsWith
(
"padding"
))
{
return
parseInsets
(
value
);
...
...
@@ -131,7 +133,6 @@ public class UITheme {
}
else
{
final
Color
color
=
parseColor
(
value
);
final
Integer
invVal
=
getInteger
(
value
);
final
Boolean
boolVal
=
"true"
.
equals
(
value
)
?
Boolean
.
TRUE
:
"false"
.
equals
(
value
)
?
Boolean
.
FALSE
:
null
;
Icon
icon
=
value
.
startsWith
(
"AllIcons."
)
?
IconLoader
.
getIcon
(
value
)
:
null
;
if
(
color
!=
null
)
{
return
new
ColorUIResource
(
color
);
...
...
@@ -139,8 +140,6 @@ public class UITheme {
return
invVal
;
}
else
if
(
icon
!=
null
)
{
return
new
IconUIResource
(
icon
);
}
else
if
(
boolVal
!=
null
)
{
return
boolVal
;
}
}
return
value
;
...
...
This diff is collapsed.
Click to expand it.
小 白蛋
@baidan
mentioned in commit
2ed305a9
·
2 years ago
mentioned in commit
2ed305a9
mentioned in commit 2ed305a92ebbc0dbd1d3eb73670115c703112a2c
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help