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

esc now properly closes menu windows #768

Merged
merged 2 commits into from
Sep 20, 2021
Merged

esc now properly closes menu windows #768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1464123
esc now properly closes menu windows
KarlTD Sep 17, 2021
bb3e41e
Set focus on copy button and associate Enter key
e9gille Sep 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,25 @@
return !0;
};
}
let cpy = document.getElementById('abt_copy');
document.getElementById('abt_close').onclick = () => { window.close() };;
let cpy = document.getElementById('abt_copy');
cpy.onclick = () => {
let ta = document.getElementById('abt_ta');
ta.select();
document.execCommand('copy');
ta.selectionEnd = 0;
ta.select();
document.execCommand('copy');
ta.selectionEnd = 0;
};
cpy.focus();
const abt = document.getElementById('abt');
abt.tabIndex = 0;
abt.onkeydown = (x) => {
if (x.key === 'Escape') {
window.close();
return !1;
} else if (x.key === 'Enter') {
cpy.click();
}
};
cpy.hidden = !document.queryCommandSupported('copy');
</script>
</body>
</html>
2 changes: 2 additions & 0 deletions src/prf_ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
}
if (!d) {
d = I.prf_dlg;
$(`#${d.id}>div`).attr('tabIndex', 0);
d.onkeydown = (x) => {
const k = D.util.fmtKey(x);
if (k === 'Ctrl-Enter') {
Expand Down Expand Up @@ -84,6 +85,7 @@
for (let i = 0; i < hdrs.length; i++) {
const b = a === hdrs[i];
payloads[i].hidden = !b;
payloads[i].tabIndex = b ? 0 : -1;
hdrs[i].className = b ? 'sel' : '';
}
activeTab = tabs[a.href.replace(/.*#/, '')];
Expand Down
176 changes: 90 additions & 86 deletions style/dark-theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@
}
.dlg {
background-color: #1c1e28;
outline: none;
}
.dlg div {
outline: none;
}
.dlg_title,
.dlg_close {
Expand Down Expand Up @@ -142,92 +146,6 @@
text-align: left;
border: 1px solid transparent;
}
/*Golden Layout*/
.lm_goldenlayout {
background: #272937 !important;
}
.lm_goldenlayout .lm_header {
background: #272937 !important;
}
.lm_header,
.lm_content {
border-color: #272937 !important;
}
.lm_dragProxy .lm_content {
box-shadow: 2px 2px 4px rgba(255, 255, 255, 0.2);
}
.lm_dropTargetIndicator {
box-shadow: inset 0 0 30px rgba(255, 255, 255, 0.4);
outline: 1px dashed #7688d9;
margin: 1px;
transition: all 200ms ease;
}
.lm_dropTargetIndicator .lm_inner {
background: white;
opacity: 0.1;
filter: alpha(opacity=1);
}
.lm_tab {
font-family: Roboto!important;
letter-spacing: 0.5px;
font-size: 12px;
background-color: #323446 !important;
color: #a9a9a9 !important;
border-right: 1px #272937 solid !important;
}
.lm_tab.lm_active {
background-color: #1c1e28 !important;
border-right: 1px #272937 solid !important;
color: #7688d9 !important;
}
.lm_tab.lm_active .lm_close_tab {
color: #7688d9 !important;
}
.lm_splitter {
background-color: rgba(118, 136, 217, 0.3) !important;
}
.lm_splitter.lm_horizontal {
background: rgba(118, 136, 217, 0.3) url(img/grabber_vert.png) no-repeat center !important;
box-shadow: -1px 0 0 black inset, 1px 0 0 black inset;
}
.lm_splitter.lm_vertical {
background: rgba(118, 136, 217, 0.3) url(img/grabber_hor.png) no-repeat center !important;
box-shadow: 0 -1px 0 black inset, 0 1px 0 black inset;
}
.lm_header .lm_tab .lm_close_tab {
background-image: none !important;
color: #a9a9a9;
font-size: 16px;
}
.lm_header .lm_tab .lm_close_tab::before {
content: "×";
}
.lm_header .lm_tab:hover .lm_close_tab {
opacity: 1;
color: #7688d9 !important;
}
.lm_controls > li {
background-position: center center;
background-repeat: no-repeat;
position: relative;
}
.lm_controls > li:hover {
opacity: 1;
filter: alpha(opacity=100);
}
.lm_header .lm_controls .lm_tabdropdown:before {
color: #a9a9a9 !important;
}
.lm_controls .lm_maximise {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAKElEQVR4nGP8////fwYCgImQAgYGBgYWKM2IR81/okwajIpgvsMbVgAwgQYRVakEKQAAAABJRU5ErkJggg==);
}
.lm_maximised .lm_controls .lm_maximise {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAJ0lEQVR4nGP8//8/AzGAiShVI1YhCwMDA8OsWbPwBmZaWhoj0SYCAN1lBxMAX4n0AAAAAElFTkSuQmCC);
}
.lm_transition_indicator {
background-color: white;
border: 1px dashed #7688d9;
}
label {
color: #a9a9a9;
font-family: Roboto;
Expand Down Expand Up @@ -315,6 +233,92 @@ select {
border-top: 1px solid black;
border-bottom: 1px solid #2e303e;
}
/*Golden Layout*/
.lm_goldenlayout {
background: #272937 !important;
}
.lm_goldenlayout .lm_header {
background: #272937 !important;
}
.lm_header,
.lm_content {
border-color: #272937 !important;
}
.lm_dragProxy .lm_content {
box-shadow: 2px 2px 4px rgba(255, 255, 255, 0.2);
}
.lm_dropTargetIndicator {
box-shadow: inset 0 0 30px rgba(255, 255, 255, 0.4);
outline: 1px dashed #7688d9;
margin: 1px;
transition: all 200ms ease;
}
.lm_dropTargetIndicator .lm_inner {
background: white;
opacity: 0.1;
filter: alpha(opacity=1);
}
.lm_tab {
font-family: Roboto!important;
letter-spacing: 0.5px;
font-size: 12px;
background-color: #323446 !important;
color: #a9a9a9 !important;
border-right: 1px #272937 solid !important;
}
.lm_tab.lm_active {
background-color: #1c1e28 !important;
border-right: 1px #272937 solid !important;
color: #7688d9 !important;
}
.lm_tab.lm_active .lm_close_tab {
color: #7688d9 !important;
}
.lm_splitter {
background-color: rgba(118, 136, 217, 0.3) !important;
}
.lm_splitter.lm_horizontal {
background: rgba(118, 136, 217, 0.3) url(img/grabber_vert.png) no-repeat center !important;
box-shadow: -1px 0 0 black inset, 1px 0 0 black inset;
}
.lm_splitter.lm_vertical {
background: rgba(118, 136, 217, 0.3) url(img/grabber_hor.png) no-repeat center !important;
box-shadow: 0 -1px 0 black inset, 0 1px 0 black inset;
}
.lm_header .lm_tab .lm_close_tab {
background-image: none !important;
color: #a9a9a9;
font-size: 16px;
}
.lm_header .lm_tab .lm_close_tab::before {
content: "×";
}
.lm_header .lm_tab:hover .lm_close_tab {
opacity: 1;
color: #7688d9 !important;
}
.lm_controls > li {
background-position: center center;
background-repeat: no-repeat;
position: relative;
}
.lm_controls > li:hover {
opacity: 1;
filter: alpha(opacity=100);
}
.lm_header .lm_controls .lm_tabdropdown:before {
color: #a9a9a9 !important;
}
.lm_controls .lm_maximise {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAKElEQVR4nGP8////fwYCgImQAgYGBgYWKM2IR81/okwajIpgvsMbVgAwgQYRVakEKQAAAABJRU5ErkJggg==);
}
.lm_maximised .lm_controls .lm_maximise {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAJ0lEQVR4nGP8//8/AzGAiShVI1YhCwMDA8OsWbPwBmZaWhoj0SYCAN1lBxMAX4n0AAAAAElFTkSuQmCC);
}
.lm_transition_indicator {
background-color: white;
border: 1px dashed #7688d9;
}
/*menu (see ../src/menu.js for the DOM structure)*/
.menu {
background-color: #edeff5;
Expand Down
6 changes: 5 additions & 1 deletion style/less/colour/dialogs.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@
opacity: 0.2;
}

.dlg{
.dlg {
background-color:@DLG_BG_COL;
outline: none;
div {
outline: none;
}
}

.dlg_title,.dlg_close{
Expand Down
Loading