Inkscape

inkscape:djb_spacings

  1. Git
  2. lp:inkscape
  3. djb_spacings
Last commit made on 2023-07-28
Get this branch:
git clone -b djb_spacings https://git.launchpad.net/inkscape

Branch merges

Branch information

Name:
djb_spacings
Repository:
lp:inkscape

Recent commits

e7e84ab... by Daniel Boles <email address hidden>

color-palette: Don't use per-widget style provider

Those are deprecated in GTK4 and often 'work' surprisingly in GTK3/4
anyway (they don't cascade, you know, like Cascading Style Sheets...)
and in this case it appears trivial to move them to share/ui/style.css

4cf50a6... by Daniel Boles <email address hidden>

color-palette: Flatten+align btn-menu like arrows…

…already are. It looks weird having a button with a border/background
floating awkwardly in the bottom-right corner, and vertically offset.

b0dfa5c... by Daniel Boles <email address hidden>

desktop-widget: Add spacing after Z: and R: labels

Add 4px of spacing, as per the previous commits.

6929ebe... by Daniel Boles <email address hidden>

filter-effect-chooser: space after Blend mode: lbl

It looks ugly with the colon butting right into the combobox. Add 4px.

71d4f2a... by Daniel Boles <email address hidden>

color-notebook: spacing among RGBA widgets + clean

Clean up unnecessary casts, only do necessary ones once, and move away
from using gtk_box_pack_start() when gtk_container_add() is just fine.
Add 4 pixels of spacing between RGBA: label and entry, as per tabs.

a394192... by Daniel Boles <email address hidden>

dialog-container: match Fill/Stroke tab spacing, &

avoid unnecessary copies of Glib::ustring. Update the spacing between
the widgets in the tab box from 2 to 4, to match Fill/Stroke sub-tabs.

297c2a3... by Daniel Boles <email address hidden>

dialog/objects: Centre blendModePopup() + cleanups

When reviewing the Controller MR, Mike was bemused that the blend mode
popover opens wherever the pointer was. It was already thus! But it is
fairly easy to always point to the middle of the icon, so do so; hence
it is consistent where we pop up, & we don't obscure the context icon.

* Factor out from getting the expander x to get_cell_area() -> rectangle
* Use it to get cell area for blend mode icon. Change to popup at middle
* Use compound assignment to AND _is_editing with itself
* Use Controller::has_flag() to more clearly check for pressed modifiers

07fd7a5... by Daniel Boles

Initial batch of porting GdkEVent to Controllers

in preparation for GTK4, where event signals are gone, GdkEvent is an
opaque type & use of GdkEvent is discouraged in favour of Controllers

https://gitlab.com/inkscape/inkscape/-/merge_requests/5474

See MR for full details, unsquashed commits. Highlights for git blame...

ui/controller|ui/manage: new helpers for following
…commits. We have manage() to get gtkmm4-like behaviour here in gtkmm3,
get_current_event_state() to replicate a method that only GTK4 has, and
more importantly a pile of helpers to make gesture creation/adding nice

tool-base +get_latin_keyval for EventControllerKey
This will be used to replace GdkEvents in the following & future commits

dialog/align-dist ::button-press → Button::clicked
It is not really clear to me at all why we were listening to button
press events here, instead of just GtkButton::clicked, or in some cases
simply using GtkActionable. This moves to doing the former, works fine.

color-item ::button-press|enter|leave → Controller
Ditto previous commit, and we don't need to know about GdkEventButton
anymore, which is also nice. Also + #include for RefPtr, just in case.
Updated: Also replace ::enter|leave-event with GtkEventControllerMotion,
noting we seemingly need still to add_events(), and to use PHASE_TARGET.

dialog-notebook: mv from ::button-press to Gesture
Keep connecting after as before, and we need to NOT claim, else
primary-click does not switch tabs.

LPEeditor: Replace enter/leave w/ ControllerMotion
We can't use Utils::make_g_callback() because that only supports member
functions, and we have multiple LPEDrag per instance of ourself. And
it's not worth it anyway since GTK4 should make this far easier with
Widget.set_cursor(). So just do it the ugly way, via the C API.

widget/selected-style: ::button-press→GestureClick
and in doing so, make us consistently listen only for releases, like the
first two tools already did, in particular so that menus act as expected

widget/ink-spinscale: GdkEvents to Controllers and
simplify setting our cursor: use C++ API, don't set it for every motion
event but only on enter (and unset on leave), rm ineffective mask test.

5cf2719... by Daniel Boles

Cleanup use of Gtk::manage()|dynamic_cast<Widget*>

bde7056... by Daniel Boles <email address hidden>

widget/ink-color-wheel: Clean includes, namespaces

and move private functions that need not be members into the .cpp file.