Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Create setting to control build queue auto-resize #1100

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Create setting to control build queue auto-resize #1100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/evolve.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2407,6 +2407,7 @@ a {
margin-bottom: 0 !important;
}

.queue,
.theme,
.localization {
margin-bottom: 1rem;
Expand Down
42 changes: 30 additions & 12 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,9 @@ export function mainVue(){
global.settings.queuestyle = style;
updateQueueStyle();
},
setQueueResize(mode) {
global.settings.q_resize = mode;
},
icon(icon){
global.settings.icon = icon;
save.setItem('evolved',LZString.compressToUTF16(JSON.stringify(global)));
Expand Down Expand Up @@ -1285,18 +1288,6 @@ export function index(){
<b-dropdown-item v-on:click="icon('star')">${drawIcon('star',16,irank)} {{ 'star' | label }}</b-dropdown-item>
${iconlist}
</b-dropdown>

<span>{{ 'queuestyle' | label }} </span>
<b-dropdown hoverable>
<button class="button is-primary" slot="trigger">
<span>{{ s.queuestyle | label }}</span>
<i class="fas fa-sort-down"></i>
</button>
<b-dropdown-item v-on:click="setQueueStyle('standardqueuestyle')">{{ 'standardqueuestyle' | label }}</b-dropdown-item>
<b-dropdown-item v-on:click="setQueueStyle('listqueuestyle')">{{ 'listqueuestyle' | label }}</b-dropdown-item>
<b-dropdown-item v-on:click="setQueueStyle('bulletlistqueuestyle')">{{ 'bulletlistqueuestyle' | label }}</b-dropdown-item>
<b-dropdown-item v-on:click="setQueueStyle('numberedlistqueuestyle')">{{ 'numberedlistqueuestyle' | label }}</b-dropdown-item>
</b-dropdown>
</div>
<div id="localization" class="localization">
<span>{{ 'locale' | label }} </span>
Expand All @@ -1318,6 +1309,20 @@ export function index(){
<b-dropdown-item v-on:click="font('large_log')">{{ 'large_log' | label }}</b-dropdown-item>
<b-dropdown-item v-on:click="font('large_all')">{{ 'large_all' | label }}</b-dropdown-item>
</b-dropdown>
</div>

<div class="queue">
<span>{{ 'queuestyle' | label }} </span>
<b-dropdown hoverable>
<button class="button is-primary" slot="trigger">
<span>{{ s.queuestyle | label }}</span>
<i class="fas fa-sort-down"></i>
</button>
<b-dropdown-item v-on:click="setQueueStyle('standardqueuestyle')">{{ 'standardqueuestyle' | label }}</b-dropdown-item>
<b-dropdown-item v-on:click="setQueueStyle('listqueuestyle')">{{ 'listqueuestyle' | label }}</b-dropdown-item>
<b-dropdown-item v-on:click="setQueueStyle('bulletlistqueuestyle')">{{ 'bulletlistqueuestyle' | label }}</b-dropdown-item>
<b-dropdown-item v-on:click="setQueueStyle('numberedlistqueuestyle')">{{ 'numberedlistqueuestyle' | label }}</b-dropdown-item>
</b-dropdown>

<span class="settings15" aria-label="${loc('settings15')}">{{ 'q_merge' | label }} </span>
<b-dropdown hoverable>
Expand All @@ -1329,7 +1334,20 @@ export function index(){
<b-dropdown-item v-on:click="q_merge('merge_nearby')">{{ 'merge_nearby' | label }}</b-dropdown-item>
<b-dropdown-item v-on:click="q_merge('merge_all')">{{ 'merge_all' | label }}</b-dropdown-item>
</b-dropdown>

<span>{{ 'q_resize' | label }} </span>
<b-dropdown hoverable>
<button class="button is-primary" slot="trigger">
<span>{{ 'q_resize_' + s.q_resize | label }}</span>
<i class="fas fa-sort-down"></i>
</button>
<b-dropdown-item v-on:click="setQueueResize('auto')">{{ 'q_resize_auto' | label }}</b-dropdown-item>
<b-dropdown-item v-on:click="setQueueResize('grow')">{{ 'q_resize_grow' | label }}</b-dropdown-item>
<b-dropdown-item v-on:click="setQueueResize('shrink')">{{ 'q_resize_shrink' | label }}</b-dropdown-item>
<b-dropdown-item v-on:click="setQueueResize('manual')">{{ 'q_resize_manual' | label }}</b-dropdown-item>
</b-dropdown>
</div>

<b-switch class="setting" v-model="s.pause" @input="unpause"><span class="settings12" aria-label="${loc('settings12')}">{{ 'pause' | label }}</span></b-switch>
<b-switch class="setting" v-model="s.mKeys"><span class="settings1" aria-label="${loc('settings1')}">{{ 'm_keys' | label }}</span></b-switch>
<b-switch class="setting" v-model="s.cLabels"><span class="settings5" aria-label="${loc('settings5')}">{{ 'c_cat' | label }}</span></b-switch>
Expand Down
28 changes: 16 additions & 12 deletions src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10203,19 +10203,23 @@ function midLoop(){
let min = rem * 5;
let max = totHeight - (5 * rem);

const buildQueueElement = $(`#buildQueue`).get(0);
if (buildQueueElement.scrollHeight > buildQueueElement.clientHeight) {
// The build queue has a scroll-bar.
buildHeight++;
} else {
let minHeight = rem;
buildQueueElement.childNodes.forEach(function (e) {
minHeight += e.clientHeight || 0;
});
if (global.settings.q_resize !== 'manual') {
const buildQueueElement = $(`#buildQueue`).get(0);
if (['auto', 'grow'].includes(global.settings.q_resize) &&
buildQueueElement.scrollHeight > buildQueueElement.clientHeight
) {
// The build queue has a scroll-bar.
buildHeight++;
} else if (['auto', 'shrink'].includes(global.settings.q_resize)) {
let minHeight = rem;
buildQueueElement.childNodes.forEach(function (e) {
minHeight += e.clientHeight || 0;
});

if (buildQueueElement.clientHeight > minHeight) {
// The build queue is larger than it needs to be.
buildHeight = Math.min(buildHeight, minHeight);
if (buildQueueElement.clientHeight > minHeight) {
// The build queue is larger than it needs to be.
buildHeight = Math.min(buildHeight, minHeight);
}
}
}

Expand Down
4 changes: 4 additions & 0 deletions src/vars.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1685,6 +1685,10 @@ if (!global.settings['queuestyle']){
global.settings['queuestyle'] = 'standardqueuestyle';
}

if (!global.settings['q_resize']){
global.settings.q_resize = 'auto';
}

$('html').addClass(global.settings.theme);
$('html').addClass(global.settings.queuestyle);

Expand Down
5 changes: 5 additions & 0 deletions strings/strings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,11 @@
"listqueuestyle": "List queue",
"bulletlistqueuestyle": "Bullet list queue",
"numberedlistqueuestyle": "Numbered list queue",
"q_resize": "Queue size",
"q_resize_auto": "Grow and shrink",
"q_resize_grow": "Grow",
"q_resize_shrink": "Shrink",
"q_resize_manual": "Manual",
"add": "Add",
"remove": "Remove",
"active": "Active",
Expand Down