zoriya/ags
1
0
Fork 0
mirror of https://github.com/zoriya/ags.git synced 2026-06-06 20:03:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

added menubutton and popover

Browse Source 
also correctly warns for wrong enum values now
This commit is contained in:
Aylur
2023-07-30 20:01:03 +02:00
parent c50436093f
commit c5bdb018ea
2 changed files with 124 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widget.ts
+26 -26
View File
@@ -1,6 +1,6 @@
import Gtk from 'gi://Gtk?version=3.0';
import { typecheck, error, warning, interval } from './utils.js';
import * as Basic from './widgets.js';
import * as Widgets from './widgets.js';
interface ServiceAPI {
instance: {
@@ -25,21 +25,23 @@ interface Widget {
}
const widgets: { [key: string]: (props: any) => Gtk.Widget } = {
'box': Basic.Box,
'button': Basic.Button,
'centerbox': Basic.CenterBox,
'dynamic': Basic.Dynamic,
'entry': Basic.Entry,
'eventbox': Basic.EventBox,
'icon': Basic.Icon,
'label': Basic.Label,
'overlay': Basic.Overlay,
'progressbar': Basic.ProgressBar,
'revealer': Basic.Revealer,
'scrollable': Basic.Scrollable,
'slider': Basic.Slider,
'stack': Basic.Stack,
'switch': Basic.Switch,
'box': Widgets.Box,
'button': Widgets.Button,
'centerbox': Widgets.CenterBox,
'dynamic': Widgets.Dynamic,
'entry': Widgets.Entry,
'eventbox': Widgets.EventBox,
'icon': Widgets.Icon,
'label': Widgets.Label,
'overlay': Widgets.Overlay,
'progressbar': Widgets.ProgressBar,
'revealer': Widgets.Revealer,
'scrollable': Widgets.Scrollable,
'slider': Widgets.Slider,
'stack': Widgets.Stack,
'switch': Widgets.Switch,
'menubutton': Widgets.MenuButton,
'popover': Widgets.Popover,
};
export function setStyle(widget: Gtk.Widget, css: string) {
@@ -83,21 +85,19 @@ function parseParams(widget: Gtk.Widget, {
}
if (typeof halign === 'string') {
try {
// @ts-ignore
widget.halign = Gtk.Align[halign.toUpperCase()];
} catch (err) {
// @ts-ignore
const align = Gtk.Align[halign.toUpperCase()];
if (typeof align !== 'number')
warning('wrong halign value');
}
widget.halign = align;
}
if (typeof valign === 'string') {
try {
// @ts-ignore
widget.valign = Gtk.Align[valign.toUpperCase()];
} catch (err) {
// @ts-ignore
const align = Gtk.Align[valign.toUpperCase()];
if (typeof align !== 'number')
warning('wrong valign value');
}
widget.valign = align;
}
if (typeof hexpand === 'boolean')
src/widgets.js
+98 -44
View File
@@ -3,25 +3,24 @@ import Gdk from 'gi://Gdk?version=3.0';
import GLib from 'gi://GLib';
import GdkPixbuf from 'gi://GdkPixbuf';
import Widget from './widget.js';
import { typecheck, error, runCmd, restcheck, warning, getConfig } from './utils.js';
import { typecheck, runCmd, restcheck, warning, getConfig } from './utils.js';
function _orientation(str) {
function _orientation(str = 'horizontal') {
if (str === 'v')
str = 'vertical';
if (str === 'h')
str = 'horizontal';
try {
return Gtk.Orientation[str.toUpperCase()];
} catch (error) {
const orientation = Gtk.Orientation[str.toUpperCase()];
if (typeof orientation !== 'number')
warning('wrong orientation value');
}
return Gtk.Orientation.HORIZONTAL;
return orientation;
}
export function Box({ type,
export function Box({
type,
orientation = 'horizontal',
homogeneous = false,
children = [],
@@ -42,7 +41,8 @@ export function Box({ type,
return box;
}
export function EventBox({ type,
export function EventBox({
type,
onClick = '', onSecondaryClick = '', onMiddleClick = '',
onHover = '', onHoverLost = '',
onScrollUp = '', onScrollDown = '',
@@ -72,11 +72,11 @@ export function EventBox({ type,
box.connect('button-press-event', (box, e) => {
box.set_state_flags(Gtk.StateFlags.ACTIVE, false);
switch (e.get_button()[1]) {
case 1: runCmd(onClick, box); break;
case 2: runCmd(onMiddleClick, box); break;
case 3: runCmd(onSecondaryClick, box); break;
default:
break;
case 1: runCmd(onClick, box); break;
case 2: runCmd(onMiddleClick, box); break;
case 3: runCmd(onSecondaryClick, box); break;
default:
break;
}
});
@@ -103,7 +103,7 @@ export function CenterBox({ type, children = [], ...props }) {
typecheck('children', children, 'array', type);
if (children.length !== 3)
error(`${type} should have exactly 3 children!`);
warning(`${type} should have exactly 3 children!`);
const box = Box({ type, ...props });
@@ -114,7 +114,8 @@ export function CenterBox({ type, children = [], ...props }) {
return box;
}
export function Icon({ type,
export function Icon({
type,
icon = '',
size = getConfig()?.baseIconSize || 16,
...rest
@@ -134,7 +135,8 @@ export function Icon({ type,
});
}
export function Label({ type,
export function Label({
type,
label = '',
markup = false,
wrap = false,
@@ -154,12 +156,9 @@ export function Label({ type,
typecheck('yalign', yalign, 'number', type);
restcheck(rest, type);
let _justify;
try {
_justify = Gtk.Justification[justify.toUpperCase()];
} catch (error) {
const _justify = Gtk.Justification[justify.toUpperCase()];
if (typeof _justify !== 'number')
warning('wrong justify value');
}
const lbl = new Gtk.Label({
label,
@@ -175,7 +174,8 @@ export function Label({ type,
return lbl;
}
export function Button({ type,
export function Button({
type,
child,
onClick = '',
onSecondaryClick = '',
@@ -213,7 +213,8 @@ export function Button({ type,
return btn;
}
export function Slider({ type,
export function Slider({
type,
inverted = false,
orientation = 'horizontal',
min = 0,
@@ -304,7 +305,8 @@ export function Dynamic({ type, items = [], ...rest } = {}) {
return box;
}
export function Stack({ type,
export function Stack({
type,
items = [],
hhomogeneous = true,
vhomogeneous = true,
@@ -321,19 +323,18 @@ export function Stack({ type,
typecheck('items', items, 'array', type);
restcheck(rest, type);
const transitionType = Gtk.StackTransitionType[transition.toUpperCase()];
if (typeof transitionType !== 'number')
warning('wrong transition value');
const stack = new Gtk.Stack({
hhomogeneous,
vhomogeneous,
interpolateSize,
transitionDuration,
transitionType,
});
try {
stack.transitionType = Gtk.StackTransitionType[transition.toUpperCase()];
} catch (error) {
error('wrong interpolate value');
}
items.forEach(([name, widget]) => {
if (widget)
stack.add_named(Widget(widget), name);
@@ -349,7 +350,8 @@ export function Stack({ type,
return stack;
}
export function Entry({ type,
export function Entry({
type,
text = '',
placeholder = '',
onChange = '',
@@ -389,7 +391,8 @@ export function Entry({ type,
return entry;
}
export function Scrollable({ type,
export function Scrollable({
type,
child,
hscroll = 'automatic',
vscroll = 'automatic',
@@ -414,7 +417,8 @@ export function Scrollable({ type,
return scrollable;
}
export function Revealer({ type,
export function Revealer({
type,
transition = 'crossfade',
duration = 250,
child,
@@ -424,16 +428,13 @@ export function Revealer({ type,
typecheck('duration', duration, 'number', type);
restcheck(rest, type);
let transitionType;
try {
transitionType = Gtk.RevealerTransitionType[transition.toUpperCase()];
} catch (error) {
logError(error);
}
const transitionType = Gtk.RevealerTransitionType[transition.toUpperCase()];
if (typeof transitionType !== 'number')
warning('wrong transition type');
const revealer = new Gtk.Revealer({
transition_type: transitionType,
transition_duration: duration,
transitionType,
transitionDuration: duration,
});
if (child)
@@ -443,6 +444,8 @@ export function Revealer({ type,
}
export function Overlay({ type, children = [], passthrough = true, ...rest }) {
typecheck('passthrough', passthrough, 'boolean', type);
typecheck('children', children, 'array', type);
restcheck(rest, type);
const overlay = new Gtk.Overlay();
@@ -458,7 +461,8 @@ export function Overlay({ type, children = [], passthrough = true, ...rest }) {
return overlay;
}
export function ProgressBar({ type,
export function ProgressBar({
type,
value = 0,
inverted = false,
orientation = 'horizontal',
@@ -479,7 +483,8 @@ export function ProgressBar({ type,
return bar;
}
export function Switch({ type,
export function Switch({
type,
active = false,
onActivate = '',
...rest
@@ -499,3 +504,52 @@ export function Switch({ type,
return gtkswitch;
}
export function Popover({
type,
child,
position = 'bottom',
...rest
}) {
typecheck('position', position, 'string', type);
restcheck(rest, type);
const _position = Gtk.PositionType[position.toUpperCase()];
if (typeof _position !== 'number')
warning('wrong position value');
const popover = new Gtk.Popover({
position: _position,
});
if (child)
popover.add(Widget(child));
return popover;
}
export function MenuButton({
type,
child,
popover,
onToggled = '',
...rest
}) {
typecheck('onToggled', onToggled, ['string', 'function'], type);
restcheck(rest, type);
const button = new Gtk.MenuButton({
use_popover: true,
});
if (onToggled)
button.connect('toggled', () => runCmd(onToggled, button));
if (popover)
button.set_popover(Widget(popover));
if (child)
button.add(Widget(child));
return button;
}