nosklo
/
DrawOnYourScreen
mirror of https://codeberg.org/som/DrawOnYourScreen
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix font-color label color 

Foreground color markup is not displayed since 3.36, use style instead but the transparency is lost.

close #31
This commit is contained in:
abakkk 2020-06-01 19:28:06 +02:00
parent a4456762b5
commit 11a00a25d0
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
draw.js
View File

@ -108,7 +108,7 @@ const getJsonFiles = function() {
var DrawingArea = new Lang.Class({ var DrawingArea = new Lang.Class({
Name: 'DrawOnYourScreenDrawingArea', Name: 'DrawOnYourScreenDrawingArea',
Extends: St.DrawingArea, Extends: St.DrawingArea,
Signals: { 'show-osd': { param_types: [GObject.TYPE_STRING, GObject.TYPE_STRING, GObject.TYPE_DOUBLE] }, Signals: { 'show-osd': { param_types: [GObject.TYPE_STRING, GObject.TYPE_STRING, GObject.TYPE_STRING, GObject.TYPE_DOUBLE] },
'stop-drawing': {} }, 'stop-drawing': {} },
_init: function(params, monitor, helper, loadPersistent) { _init: function(params, monitor, helper, loadPersistent) {
@ -378,7 +378,7 @@ var DrawingArea = new Lang.Class({
if (this.currentElement.shape == Shapes.TEXT && this.currentElement.state == TextState.DRAWING) { if (this.currentElement.shape == Shapes.TEXT && this.currentElement.state == TextState.DRAWING) {
this.currentElement.state = TextState.WRITING; this.currentElement.state = TextState.WRITING;
this.currentElement.text = ''; this.currentElement.text = '';
this.emit('show-osd', null, _("Type your text\nand press Enter"), -1); this.emit('show-osd', null, _("Type your text\nand press Enter"), "", -1);
this._updateTextCursorTimeout(); this._updateTextCursorTimeout();
this.textHasCursor = true; this.textHasCursor = true;
this._redisplay(); this._redisplay();
@ -525,38 +525,39 @@ var DrawingArea = new Lang.Class({
this.currentElement.color = this.currentColor.to_string(); this.currentElement.color = this.currentColor.to_string();
this._redisplay(); this._redisplay();
} }
this.emit('show-osd', null, `<span foreground="${this.currentColor.to_string()}">${this.currentColor.to_string()}</span>`, -1); // Foreground color markup is not displayed since 3.36, use style instead but the transparency is lost.
this.emit('show-osd', null, this.currentColor.to_string(), this.currentColor.to_string().slice(0, 7), -1);
}, },
selectShape: function(shape) { selectShape: function(shape) {
this.currentShape = shape; this.currentShape = shape;
this.emit('show-osd', null, _(ShapeNames[shape]), -1); this.emit('show-osd', null, _(ShapeNames[shape]), "", -1);
this.updatePointerCursor(); this.updatePointerCursor();
}, },
toggleFill: function() { toggleFill: function() {
this.fill = !this.fill; this.fill = !this.fill;
this.emit('show-osd', null, this.fill ? _("Fill") : _("Stroke"), -1); this.emit('show-osd', null, this.fill ? _("Fill") : _("Stroke"), "", -1);
}, },
toggleDash: function() { toggleDash: function() {
this.dashedLine = !this.dashedLine; this.dashedLine = !this.dashedLine;
this.emit('show-osd', null, this.dashedLine ? _("Dashed line") : _("Full line"), -1); this.emit('show-osd', null, this.dashedLine ? _("Dashed line") : _("Full line"), "", -1);
}, },
incrementLineWidth: function(increment) { incrementLineWidth: function(increment) {
this.currentLineWidth = Math.max(this.currentLineWidth + increment, 0); this.currentLineWidth = Math.max(this.currentLineWidth + increment, 0);
this.emit('show-osd', null, this.currentLineWidth + " " + _("px"), 2 * this.currentLineWidth); this.emit('show-osd', null, this.currentLineWidth + " " + _("px"), "", 2 * this.currentLineWidth);
}, },
toggleLineJoin: function() { toggleLineJoin: function() {
this.currentLineJoin = this.currentLineJoin == 2 ? 0 : this.currentLineJoin + 1; this.currentLineJoin = this.currentLineJoin == 2 ? 0 : this.currentLineJoin + 1;
this.emit('show-osd', null, _(LineJoinNames[this.currentLineJoin]), -1); this.emit('show-osd', null, _(LineJoinNames[this.currentLineJoin]), "", -1);
}, },
toggleLineCap: function() { toggleLineCap: function() {
this.currentLineCap = this.currentLineCap == 2 ? 0 : this.currentLineCap + 1; this.currentLineCap = this.currentLineCap == 2 ? 0 : this.currentLineCap + 1;
this.emit('show-osd', null, _(LineCapNames[this.currentLineCap]), -1); this.emit('show-osd', null, _(LineCapNames[this.currentLineCap]), "", -1);
}, },
toggleFontWeight: function() { toggleFontWeight: function() {
@ -565,7 +566,7 @@ var DrawingArea = new Lang.Class({
this.currentElement.font.weight = this.currentFontWeight; this.currentElement.font.weight = this.currentFontWeight;
this._redisplay(); this._redisplay();
} }
this.emit('show-osd', null, `<span font_weight="${FontWeightNames[this.currentFontWeight].toLowerCase()}">${_(FontWeightNames[this.currentFontWeight])}</span>`, -1); this.emit('show-osd', null, `<span font_weight="${FontWeightNames[this.currentFontWeight].toLowerCase()}">${_(FontWeightNames[this.currentFontWeight])}</span>`, "", -1);
}, },
toggleFontStyle: function() { toggleFontStyle: function() {
@ -574,7 +575,7 @@ var DrawingArea = new Lang.Class({
this.currentElement.font.style = this.currentFontStyle; this.currentElement.font.style = this.currentFontStyle;
this._redisplay(); this._redisplay();
} }
this.emit('show-osd', null, `<span font_style="${FontStyleNames[this.currentFontStyle].toLowerCase()}">${_(FontStyleNames[this.currentFontStyle])}</span>`, -1); this.emit('show-osd', null, `<span font_style="${FontStyleNames[this.currentFontStyle].toLowerCase()}">${_(FontStyleNames[this.currentFontStyle])}</span>`, "", -1);
}, },
toggleFontFamily: function() { toggleFontFamily: function() {
@ -584,7 +585,7 @@ var DrawingArea = new Lang.Class({
this.currentElement.font.family = currentFontFamily; this.currentElement.font.family = currentFontFamily;
this._redisplay(); this._redisplay();
} }
this.emit('show-osd', null, `<span font_family="${currentFontFamily}">${_(currentFontFamily)}</span>`, -1); this.emit('show-osd', null, `<span font_family="${currentFontFamily}">${_(currentFontFamily)}</span>`, "", -1);
}, },
toggleHelp: function() { toggleHelp: function() {
@ -729,7 +730,7 @@ var DrawingArea = new Lang.Class({
GLib.file_set_contents(path, contents); GLib.file_set_contents(path, contents);
if (notify) if (notify)
this.emit('show-osd', 'document-save-symbolic', name, -1); this.emit('show-osd', 'document-save-symbolic', name, "", -1);
if (name != Me.metadata['persistent-file-name']) { if (name != Me.metadata['persistent-file-name']) {
this.jsonName = name; this.jsonName = name;
this.lastJsonContents = contents; this.lastJsonContents = contents;
@ -771,7 +772,7 @@ var DrawingArea = new Lang.Class({
this.elements.push(...JSON.parse(contents).map(object => new DrawingElement(object))); this.elements.push(...JSON.parse(contents).map(object => new DrawingElement(object)));
if (notify) if (notify)
this.emit('show-osd', 'document-open-symbolic', name, -1); this.emit('show-osd', 'document-open-symbolic', name, "", -1);
if (name != Me.metadata['persistent-file-name']) { if (name != Me.metadata['persistent-file-name']) {
this.jsonName = name; this.jsonName = name;
this.lastJsonContents = contents; this.lastJsonContents = contents;
@ -1436,13 +1437,15 @@ const DrawingMenu = new Lang.Class({
Mainloop.timeout_add(0, () => { Mainloop.timeout_add(0, () => {
for (let i = 1; i < this.area.colors.length; i++) { for (let i = 1; i < this.area.colors.length; i++) {
let text = `<span foreground="${this.area.colors[i].to_string()}">${this.area.colors[i].to_string()}</span>`; let text = this.area.colors[i].to_string();
let iCaptured = i; let iCaptured = i;
let colorItem = item.menu.addAction(text, () => { let colorItem = item.menu.addAction(text, () => {
this.area.currentColor = this.area.colors[iCaptured]; this.area.currentColor = this.area.colors[iCaptured];
item.icon.set_style(`color:${this.area.currentColor.to_string().slice(0, 7)};`); item.icon.set_style(`color:${this.area.currentColor.to_string().slice(0, 7)};`);
}); });
colorItem.label.get_clutter_text().set_use_markup(true); colorItem.label.get_clutter_text().set_use_markup(true);
// Foreground color markup is not displayed since 3.36, use style instead but the transparency is lost.
colorItem.label.set_style(`color:${this.area.colors[i].to_string().slice(0, 7)};`);
} }
return GLib.SOURCE_REMOVE; return GLib.SOURCE_REMOVE;
}); });

12
extension.js
View File

@ -339,7 +339,7 @@ var AreaManager = new Lang.Class({
}, },
// use level -1 to set no level (null) // use level -1 to set no level (null)
showOsd: function(emitter, iconName, label, level) { showOsd: function(emitter, iconName, label, color, level) {
if (this.osdDisabled) if (this.osdDisabled)
return; return;
let activeIndex = this.areas.indexOf(this.activeArea); let activeIndex = this.areas.indexOf(this.activeArea);
@ -359,6 +359,16 @@ var AreaManager = new Lang.Class({
Main.osdWindowManager.show(activeIndex, icon || this.enterGicon, label, level, maxLevel); Main.osdWindowManager.show(activeIndex, icon || this.enterGicon, label, level, maxLevel);
Main.osdWindowManager._osdWindows[activeIndex]._label.get_clutter_text().set_use_markup(true); Main.osdWindowManager._osdWindows[activeIndex]._label.get_clutter_text().set_use_markup(true);
if (color) {
Main.osdWindowManager._osdWindows[activeIndex]._icon.set_style(`color:${color};`);
Main.osdWindowManager._osdWindows[activeIndex]._label.set_style(`color:${color};`);
let osdColorChangedHandler = Main.osdWindowManager._osdWindows[activeIndex]._label.connect('notify::text', () => {
Main.osdWindowManager._osdWindows[activeIndex]._icon.set_style(`color:;`);
Main.osdWindowManager._osdWindows[activeIndex]._label.set_style(`color:;`);
Main.osdWindowManager._osdWindows[activeIndex]._label.disconnect(osdColorChangedHandler);
});
}
if (level === 0) { if (level === 0) {
Main.osdWindowManager._osdWindows[activeIndex]._label.add_style_class_name(WARNING_COLOR_STYLE_CLASS_NAME); Main.osdWindowManager._osdWindows[activeIndex]._label.add_style_class_name(WARNING_COLOR_STYLE_CLASS_NAME);
// the same label is shared by all GS OSD so the style must be removed after being used // the same label is shared by all GS OSD so the style must be removed after being used