Skip to content

Commit 171ce28

Browse files
authored
Merge pull request #2054 from uzzyDC/fix-dialog-scroll2
Fix android DialogChooseFolder
2 parents f82dbcb + d0e64f0 commit 171ce28

File tree

2 files changed

+46
-33
lines changed

2 files changed

+46
-33
lines changed

_locales/en/messages.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,9 @@
278278
"LabelSave": {
279279
"message": "Save"
280280
},
281+
"LabelSelect": {
282+
"message": "Select"
283+
},
281284
"LabelCancel": {
282285
"message": "Cancel"
283286
},

src/ui/components/native/DialogChooseFolder.vue

Lines changed: 43 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,50 +4,60 @@
44
max-width="500"
55
:style="{height: '500px !important'}"
66
@input="$emit('update:display', $event)">
7-
<v-card>
8-
<v-row no-gutters>
7+
<v-card class="d-flex flex-column" max-height="calc(100vh - 100px)">
8+
<!-- Fixed header row -->
9+
<div class="d-flex align-center justify-space-between px-4 py-2">
10+
<span class="text-h6">{{ t('LabelChoosefolder') }}</span>
11+
<v-btn color="primary" @click="onSave">{{ t('LabelSelect') }}</v-btn>
12+
</div>
13+
<!-- <v-row no-gutters>
914
<v-col class="flex-grow-1">
1015
<v-card-title class="headline">
1116
{{ t('LabelChoosefolder') }}
1217
</v-card-title>
1318
</v-col>
1419
<v-col class="flex-grow-0">
1520
<v-btn
16-
class="primary ma-2"
21+
color="primary"
22+
class="ma-2"
1723
@click="onSave">
18-
save
24+
select
1925
</v-btn>
2026
</v-col>
21-
</v-row>
22-
<v-treeview
23-
class="pa-4"
24-
activatable
25-
:item-text="'title'"
26-
:item-key="'id'"
27-
:active="[value]"
28-
:open="[tree.id]"
29-
:items="[privateTree]"
30-
dense
31-
@update:active="onUpdateSelection">
32-
<template #prepend="{ open }">
33-
<v-icon>
34-
{{ open ? 'mdi-folder-open' : 'mdi-folder' }}
35-
</v-icon>
36-
</template>
37-
<template #label="{item}">
38-
{{ item.title || t('LabelUntitledfolder') }}
39-
</template>
40-
<template #append="{item}">
41-
<v-btn
42-
small
43-
rounded
44-
@click="onCreate(item.id)">
27+
</v-row> -->
28+
29+
<!-- Scrollable area -->
30+
<v-card-text class="flex-grow-1 overflow-y-auto">
31+
<v-treeview
32+
class="pa-4"
33+
activatable
34+
:item-text="'title'"
35+
:item-key="'id'"
36+
:active="[value]"
37+
:open="[tree.id]"
38+
:items="[privateTree]"
39+
dense
40+
@update:active="onUpdateSelection">
41+
<template #prepend="{ open }">
4542
<v-icon>
46-
mdi-plus
43+
{{ open ? 'mdi-folder-open' : 'mdi-folder' }}
4744
</v-icon>
48-
</v-btn>
49-
</template>
50-
</v-treeview>
45+
</template>
46+
<template #label="{item}">
47+
{{ item.title || t('LabelUntitledfolder') }}
48+
</template>
49+
<template #append="{item}">
50+
<v-btn
51+
small
52+
rounded
53+
@click="onCreate(item.id)">
54+
<v-icon>
55+
mdi-plus
56+
</v-icon>
57+
</v-btn>
58+
</template>
59+
</v-treeview>
60+
</v-card-text>
5161
</v-card>
5262
</v-dialog>
5363
</template>
@@ -136,4 +146,4 @@ export default {
136146

137147
<style scoped>
138148
139-
</style>
149+
</style>

0 commit comments

Comments
 (0)