Skip to content

Instantly share code, notes, and snippets.

@ndbroadbent
Created September 21, 2011 15:06
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save ndbroadbent/1232291 to your computer and use it in GitHub Desktop.
Save ndbroadbent/1232291 to your computer and use it in GitHub Desktop.
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: nathan.f77@gmail.com-20110921150425-ir9m3ot05rozkttf
# target_branch: http://bazaar.launchpad.net/~inkscape.dev/inkscape\
# /trunk/
# testament_sha1: 1946394c022a88fa90e090cef6e0f7991a88d338
# timestamp: 2011-09-21 23:05:02 +0800
# base_revision_id: juca@members.fsf.org-20110919175042-\
# 532nbha31h5sb498
#
# Begin patch
=== modified file 'src/desktop.cpp'
--- src/desktop.cpp 2011-08-27 14:58:22 +0000
+++ src/desktop.cpp 2011-09-21 15:04:25 +0000
@@ -1715,9 +1715,9 @@
if (flags & SP_OBJECT_MODIFIED_FLAG) {
/* Show/hide page background */
- if (nv->pagecolor & 0xff) {
+ if (nv->pagecolor | 0xff != 0xffffffff) {
sp_canvas_item_show (desktop->table);
- ((CtrlRect *) desktop->table)->setColor(0x00000000, true, nv->pagecolor);
+ ((CtrlRect *) desktop->table)->setColor(0x00000000, true, nv->pagecolor | 0xff);
sp_canvas_item_move_to_z (desktop->table, 0);
} else {
sp_canvas_item_hide (desktop->table);
@@ -1756,11 +1756,10 @@
}
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- if (SP_RGBA32_A_U(nv->pagecolor) < 128 ||
- (SP_RGBA32_R_U(nv->pagecolor) +
- SP_RGBA32_G_U(nv->pagecolor) +
- SP_RGBA32_B_U(nv->pagecolor)) >= 384) {
- // the background color is light or transparent, use black outline
+ if (SP_RGBA32_R_U(nv->pagecolor) +
+ SP_RGBA32_G_U(nv->pagecolor) +
+ SP_RGBA32_B_U(nv->pagecolor) >= 384) {
+ // the background color is light, use black outline
SP_CANVAS_ARENA (desktop->drawing)->drawing.outlinecolor = prefs->getInt("/options/wireframecolors/onlight", 0xff);
} else { // use white outline
SP_CANVAS_ARENA (desktop->drawing)->drawing.outlinecolor = prefs->getInt("/options/wireframecolors/ondark", 0xffffffff);
@@ -1847,3 +1846,4 @@
End:
*/
// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
+
# Begin bundle
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment