Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Quincy379
jadx
提交
bcadc282
J
jadx
项目概览
Quincy379
/
jadx
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jadx
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
bcadc282
编写于
2月 17, 2019
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(gui): use system font as default instead bundled Hack (#442, #445)
上级
7e95758a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
17 addition
and
10 deletion
+17
-10
jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java
jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java
+14
-5
jadx-gui/src/main/java/jadx/gui/settings/JadxSettingsWindow.java
...i/src/main/java/jadx/gui/settings/JadxSettingsWindow.java
+3
-1
jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
+0
-4
未找到文件。
jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java
浏览文件 @
bcadc282
...
...
@@ -10,6 +10,7 @@ import java.util.Map;
import
java.util.Set
;
import
org.fife.ui.rsyntaxtextarea.RSyntaxTextArea
;
import
org.jetbrains.annotations.Nullable
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -20,16 +21,14 @@ import jadx.gui.utils.LangLocale;
import
jadx.gui.utils.NLS
;
import
jadx.gui.utils.Utils
;
import
static
jadx
.
gui
.
utils
.
Utils
.
FONT_HACK
;
public
class
JadxSettings
extends
JadxCLIArgs
{
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
JadxSettings
.
class
);
private
static
final
String
USER_HOME
=
System
.
getProperty
(
"user.home"
);
private
static
final
int
RECENT_FILES_COUNT
=
15
;
private
static
final
int
CURRENT_SETTINGS_VERSION
=
6
;
private
static
final
int
CURRENT_SETTINGS_VERSION
=
7
;
private
static
final
Font
DEFAULT_FONT
=
FONT_HACK
!=
null
?
FONT_HACK
:
new
RSyntaxTextArea
().
getFont
();
private
static
final
Font
DEFAULT_FONT
=
new
RSyntaxTextArea
().
getFont
();
static
final
Set
<
String
>
SKIP_FIELDS
=
new
HashSet
<>(
Arrays
.
asList
(
"files"
,
"input"
,
"outputDir"
,
"verbose"
,
"printHelp"
...
...
@@ -263,7 +262,11 @@ public class JadxSettings extends JadxCLIArgs {
return
Font
.
decode
(
fontStr
);
}
public
void
setFont
(
Font
font
)
{
public
void
setFont
(
@Nullable
Font
font
)
{
if
(
font
==
null
)
{
this
.
fontStr
=
""
;
return
;
}
StringBuilder
sb
=
new
StringBuilder
();
sb
.
append
(
font
.
getFontName
());
String
fontStyleName
=
Utils
.
getFontStyleName
(
font
.
getStyle
()).
replaceAll
(
" "
,
""
);
...
...
@@ -314,6 +317,12 @@ public class JadxSettings extends JadxCLIArgs {
}
if
(
fromVersion
==
5
)
{
setRespectBytecodeAccessModifiers
(
false
);
fromVersion
++;
}
if
(
fromVersion
==
6
)
{
if
(
getFont
().
getFontName
().
equals
(
"Hack Regular"
))
{
setFont
(
null
);
}
}
settingsVersion
=
CURRENT_SETTINGS_VERSION
;
sync
();
...
...
jadx-gui/src/main/java/jadx/gui/settings/JadxSettingsWindow.java
浏览文件 @
bcadc282
...
...
@@ -74,6 +74,7 @@ public class JadxSettingsWindow extends JDialog {
JButton
cancelButton
=
new
JButton
(
NLS
.
str
(
"preferences.cancel"
));
cancelButton
.
addActionListener
(
event
->
{
JadxSettingsAdapter
.
fill
(
settings
,
startSettings
);
mainWindow
.
loadSettings
();
dispose
();
});
...
...
@@ -87,6 +88,8 @@ public class JadxSettingsWindow extends JDialog {
if
(
res
==
JOptionPane
.
YES_OPTION
)
{
String
defaults
=
JadxSettingsAdapter
.
makeString
(
JadxSettings
.
makeDefault
());
JadxSettingsAdapter
.
fill
(
settings
,
defaults
);
mainWindow
.
loadSettings
();
needReload
();
getContentPane
().
removeAll
();
initUI
();
pack
();
...
...
@@ -197,7 +200,6 @@ public class JadxSettingsWindow extends JDialog {
Font
font
=
fontChooser
.
getSelectedFont
();
LOG
.
debug
(
"Selected Font: {}"
,
font
);
settings
.
setFont
(
font
);
mainWindow
.
updateFont
(
font
);
mainWindow
.
loadSettings
();
fontLabel
.
setText
(
getFontLabelStr
());
}
...
...
jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
浏览文件 @
bcadc282
...
...
@@ -652,10 +652,6 @@ public class MainWindow extends JFrame {
setSize
((
int
)
(
w
*
WINDOW_RATIO
),
(
int
)
(
h
*
WINDOW_RATIO
));
}
public
void
updateFont
(
Font
font
)
{
setFont
(
font
);
}
public
static
void
registerBundledFonts
()
{
GraphicsEnvironment
grEnv
=
GraphicsEnvironment
.
getLocalGraphicsEnvironment
();
if
(
Utils
.
FONT_HACK
!=
null
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录