CodeMirror/Picocrypt
1
0
Fork 0
mirror of https://github.com/HACKERALERT/Picocrypt.git synced 2024-09-28 23:31:34 +12:00
Code Issues Projects Releases Wiki Activity

Fix keyfile modal layout, plus other fixes

Browse source
This commit is contained in:
Evan Su 2021-11-02 22:57:35 -04:00 committed by GitHub
parent 0a8097b207
commit 2ef5073dfc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/unstable/Picocrypt.go
View file

@ -225,8 +225,8 @@ var shredText string
var shredOverlay string var shredOverlay string
func draw() { func draw() {
giu.SingleWindow().Flags(giu.WindowFlagsNoDecoration|giu.WindowFlagsNoNav| giu.SingleWindow().Flags(giu.WindowFlagsNoDecoration|giu.WindowFlagsNoNavFocus|giu.WindowFlagsNoMove|
giu.WindowFlagsNoMove|giu.WindowFlagsNoScrollWithMouse).Layout( giu.WindowFlagsNoScrollWithMouse).Layout(
giu.Custom(func() { giu.Custom(func() {
pos := giu.GetCursorPos() pos := giu.GetCursorPos()
w, _ := giu.CalcTextSize(languages[languageSelected]) w, _ := giu.CalcTextSize(languages[languageSelected])
@ -283,10 +283,8 @@ func draw() {
giu.Custom(func() { giu.Custom(func() {
if showKeyfile { if showKeyfile {
giu.PopupModal(s("Manage keyfiles:")). giu.PopupModal(s("Manage keyfiles:")).
Flags(giu.WindowFlagsNoMove|giu.WindowFlagsNoResize).Layout( Flags(giu.WindowFlagsNoMove|giu.WindowFlagsNoResize|giu.WindowFlagsAlwaysAutoResize).Layout(
giu.Row( giu.Label(s("Drag and drop your keyfiles here.")),
giu.Label(s("Drop and drop your keyfiles.")),
),
giu.Custom(func() { giu.Custom(func() {
if mode != "decrypt" { if mode != "decrypt" {
giu.Checkbox(s("Require correct keyfile order"), &keyfileOrderMatters).Build() giu.Checkbox(s("Require correct keyfile order"), &keyfileOrderMatters).Build()
@ -299,8 +297,7 @@ func draw() {
giu.Custom(func() { giu.Custom(func() {
for _, i := range keyfiles { for _, i := range keyfiles {
giu.Row( giu.Row(
giu.Label(filepath.Base(i)), giu.SmallButton("×").OnClick(func() {
giu.Button("Remove").OnClick(func() {
var tmp []string var tmp []string
for _, j := range keyfiles { for _, j := range keyfiles {
if j != i { if j != i {
@ -308,15 +305,23 @@ func draw() {
} }
} }
keyfiles = tmp keyfiles = tmp
if len(keyfiles) == 0 {
keyfilePrompt = s("None selected.")
} else if len(keyfiles) == 1 {
keyfilePrompt = s("Using 1 keyfile.")
} else {
keyfilePrompt = fmt.Sprintf(s("Using %d keyfiles."), len(keyfiles))
}
}), }),
giu.Label(filepath.Base(i)),
).Build() ).Build()
} }
}), }),
giu.Dummy(0, 200),
giu.Row( giu.Row(
giu.Button(s("Clear")).Size(150, 0).OnClick(func() { giu.Button(s("Clear")).Size(150, 0).OnClick(func() {
keyfiles = nil keyfiles = nil
keyfilePrompt = s("None selected.")
}), }),
giu.Tooltip(s("Remove all keyfiles.")), giu.Tooltip(s("Remove all keyfiles.")),
giu.Button(s("Done")).Size(150, 0).OnClick(func() { giu.Button(s("Done")).Size(150, 0).OnClick(func() {
@ -1014,8 +1019,9 @@ func onDrop(names []string) {
keyfiles = tmp keyfiles = tmp
if len(keyfiles) == 1 { if len(keyfiles) == 1 {
keyfilePrompt = s("Using 1 keyfile.") keyfilePrompt = s("Using 1 keyfile.")
} else {
keyfilePrompt = fmt.Sprintf(s("Using %d keyfiles."), len(keyfiles))
} }
keyfilePrompt = fmt.Sprintf(s("Using %d keyfiles."), len(keyfiles))
return return
} }