Просмотр исходного кода

Split the menu; add captions to buttons

master
Fen Dweller 3 лет назад
Родитель
Сommit
c3530a60cf
3 измененных файлов: 56 добавлений и 9 удалений
  1. +24
    -5
      macrovision.css
  2. +12
    -1
      macrovision.html
  3. +20
    -3
      macrovision.js

+ 24
- 5
macrovision.css Просмотреть файл

@@ -316,8 +316,26 @@ body.show-extra-options .options-block.options-block-optional {
height: 64pt; height: 64pt;
} }


.menubar-group button div ~ i {
font-size: 18pt;
position: absolute;
top: 4px;
margin: auto;
left: 0;
right: 0;
}

.menubar-group button div {
font-size: 12pt;
position: absolute;
bottom: 4px;
margin: auto;
left: 0;
right: 0;
}

.menubar-group input { .menubar-group input {
font-size: 24pt;
font-size: 18pt;
} }


.popout-group { .popout-group {
@@ -981,6 +999,7 @@ button {
user-select: none; user-select: none;
-webkit-user-select: none; -webkit-user-select: none;
flex: 1; flex: 1;
color: #ddd;
} }


.settings-holder.disabled { .settings-holder.disabled {
@@ -989,7 +1008,7 @@ button {
} }


.settings-name { .settings-name {
font-size: 200%;
font-size: 150%;
margin-left: 8pt; margin-left: 8pt;
user-select: none; user-select: none;
-webkit-user-select: none; -webkit-user-select: none;
@@ -1050,12 +1069,12 @@ body.screenshot-mode .scroll-button {
} }


.filter-holder > select { .filter-holder > select {
font-size: 200%;
font-size: 150%;
width: 100%; width: 100%;
} }


.filter-holder > div { .filter-holder > div {
font-size: 200%;
font-size: 150%;
flex-basis: 150pt; flex-basis: 150pt;
} }


@@ -1074,7 +1093,7 @@ body.screenshot-mode .scroll-button {


.info-holder > div, .info-holder > div,
.info-holder > i { .info-holder > i {
font-size: 200%;
font-size: 150%;
margin: 10px; margin: 10px;
} }




+ 12
- 1
macrovision.html Просмотреть файл

@@ -83,28 +83,39 @@
<div id="menubar"> <div id="menubar">
<span class="menubar-group"> <span class="menubar-group">
<button id="toggle-menu"> <button id="toggle-menu">
<div>Menu</div>
<i class="fas fa-bars"></i> <i class="fas fa-bars"></i>
</button> </button>
<button id="toggle-scene">
<div>Scene</div>
<i class="fas fa-map"></i>
</button>
<button id="toggle-settings"> <button id="toggle-settings">
<div>Settings</div>
<i class="fas fa-cogs"></i> <i class="fas fa-cogs"></i>
</button> </button>
<button id="toggle-filters"> <button id="toggle-filters">
<div>Filters</div>
<i class="fas fa-search"></i> <i class="fas fa-search"></i>
</button> </button>
<button id="toggle-info"> <button id="toggle-info">
<i class="fas fa-info-circle"></i>
<div>Help</div>
<i class="fas fa-question-circle"></i>
</button> </button>
</span> </span>
<span class="menubar-group" id="spawners"> <span class="menubar-group" id="spawners">
</span> </span>
<span class="menubar-group"> <span class="menubar-group">
<button id="copy-screenshot"> <button id="copy-screenshot">
<div>Screenshot</div>
<i class="fas fa-camera"></i> <i class="fas fa-camera"></i>
</button> </button>
<button id="save-screenshot"> <button id="save-screenshot">
<div>Save</div>
<i class="fas fa-download"></i> <i class="fas fa-download"></i>
</button> </button>
<button id="open-screenshot"> <button id="open-screenshot">
<div>Open Tab</div>
<i class="fas fa-external-link-alt"></i> <i class="fas fa-external-link-alt"></i>
</button> </button>
</span> </span>


+ 20
- 3
macrovision.js Просмотреть файл

@@ -3147,84 +3147,100 @@ function handleResize(update = true) {
} }


function preparePopoutMenu() { function preparePopoutMenu() {
const menubar = document.querySelector("#menu-menu");

const menubars = {
"menu": document.querySelector("#menu-menu"),
"scene": document.querySelector("#scene-menu")
};
[ [
{ {
name: "Show/hide sidebar", name: "Show/hide sidebar",
id: "menu-toggle-sidebar", id: "menu-toggle-sidebar",
icon: "fas fa-chevron-circle-down", icon: "fas fa-chevron-circle-down",
rotates: true, rotates: true,
type: "menu"
}, },
{ {
name: "Fullscreen", name: "Fullscreen",
id: "menu-fullscreen", id: "menu-fullscreen",
icon: "fas fa-compress", icon: "fas fa-compress",
type: "menu"
}, },
{ {
name: "Clear", name: "Clear",
id: "menu-clear", id: "menu-clear",
icon: "fas fa-file", icon: "fas fa-file",
type: "scene"
}, },
{ {
name: "Sort by height", name: "Sort by height",
id: "menu-order-height", id: "menu-order-height",
icon: "fas fa-sort-numeric-up", icon: "fas fa-sort-numeric-up",
type: "scene"
}, },
{ {
name: "Permalink", name: "Permalink",
id: "menu-permalink", id: "menu-permalink",
icon: "fas fa-link", icon: "fas fa-link",
type: "scene"
}, },
{ {
name: "Export to clipboard", name: "Export to clipboard",
id: "menu-export", id: "menu-export",
icon: "fas fa-share", icon: "fas fa-share",
type: "scene"
}, },
{ {
name: "Import from clipboard", name: "Import from clipboard",
id: "menu-import", id: "menu-import",
icon: "fas fa-share", icon: "fas fa-share",
classes: ["flipped"], classes: ["flipped"],
type: "scene"
}, },
{ {
name: "Save Scene", name: "Save Scene",
id: "menu-save", id: "menu-save",
icon: "fas fa-download", icon: "fas fa-download",
input: true, input: true,
type: "scene"
}, },
{ {
name: "Load Scene", name: "Load Scene",
id: "menu-load", id: "menu-load",
icon: "fas fa-upload", icon: "fas fa-upload",
select: true, select: true,
type: "scene"
}, },
{ {
name: "Delete Scene", name: "Delete Scene",
id: "menu-delete", id: "menu-delete",
icon: "fas fa-trash", icon: "fas fa-trash",
select: true, select: true,
type: "scene"
}, },
{ {
name: "Load Autosave", name: "Load Autosave",
id: "menu-load-autosave", id: "menu-load-autosave",
icon: "fas fa-redo", icon: "fas fa-redo",
type: "scene"
}, },
{ {
name: "Load Preset", name: "Load Preset",
id: "menu-preset", id: "menu-preset",
icon: "fas fa-play", icon: "fas fa-play",
select: true, select: true,
type: "scene"
}, },
{ {
name: "Add Image", name: "Add Image",
id: "menu-add-image", id: "menu-add-image",
icon: "fas fa-camera", icon: "fas fa-camera",
type: "menu"
}, },
{ {
name: "Clear Rulers", name: "Clear Rulers",
id: "menu-clear-rulers", id: "menu-clear-rulers",
icon: "fas fa-ruler", icon: "fas fa-ruler",
type: "menu"
}, },
].forEach((entry) => { ].forEach((entry) => {
const buttonHolder = document.createElement("div"); const buttonHolder = document.createElement("div");
@@ -3279,7 +3295,7 @@ function preparePopoutMenu() {
buttonHolder.appendChild(select); buttonHolder.appendChild(select);
} }


menubar.appendChild(buttonHolder);
menubars[entry.type].appendChild(buttonHolder);
}); });


document document
@@ -4193,6 +4209,7 @@ function setupMenuButtons() {
}); });


setupPopoutMenu("menu"); setupPopoutMenu("menu");
setupPopoutMenu("scene");
setupPopoutMenu("settings"); setupPopoutMenu("settings");
setupPopoutMenu("filters"); setupPopoutMenu("filters");
setupPopoutMenu("info"); setupPopoutMenu("info");


Загрузка…
Отмена
Сохранить