Skip to content

Make Shutter read the xpm cursors x_hot and y_hot coordinates - #813

Merged
Photon89 merged 3 commits into
masterfrom
fix-xpm-loading
May 9, 2026
Merged

Make Shutter read the xpm cursors x_hot and y_hot coordinates#813
Photon89 merged 3 commits into
masterfrom
fix-xpm-loading

Conversation

@Photon89

@Photon89Photon89 commented May 9, 2026

Copy link
Copy Markdown
Member

Since upstream is irresponsive (see https://gitlab.gnome.org/GNOME/glycin/-/work_items/291), Shutter can now read the coordinates directly from the xpm files. This will fix#808.

@Photon89
Photon89 requested a review from DarthGandalfMay 9, 2026 05:53
DarthGandalf
DarthGandalf reviewed May 9, 2026
View reviewed changes
Comment threadshare/shutter/resources/modules/Shutter/Draw/DrawingTool.pm Outdated
Comment threadshare/shutter/resources/modules/Shutter/Draw/DrawingTool.pm Outdated
Comment threadshare/shutter/resources/modules/Shutter/Draw/DrawingTool.pm
Comment threadshare/shutter/resources/modules/Shutter/Draw/DrawingTool.pm Outdated
Comment threadshare/shutter/resources/modules/Shutter/Draw/DrawingTool.pm Outdated
Comment threadshare/shutter/resources/modules/Shutter/Draw/DrawingTool.pm Outdated
DarthGandalf
DarthGandalf reviewed May 9, 2026
View reviewed changes
Comment threadshare/shutter/resources/modules/Shutter/Draw/DrawingTool.pm Outdated
#of these values
$self->{_cursors}{$cname}{'x_hot'} = $self->{_cursors}{$cname}->get_option('x_hot');
$self->{_cursors}{$cname}{'y_hot'} = $self->{_cursors}{$cname}->get_option('y_hot');
if (!$pixbuf) {

@DarthGandalfDarthGandalfMay 9, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here is mix of tabs and spaces

@Photon89Photon89May 9, 2026

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed!

DarthGandalf
DarthGandalf reviewed May 9, 2026
View reviewed changes
Comment threadshare/shutter/resources/modules/Shutter/Draw/DrawingTool.pm Outdated
$self->{_cursors}{$self->{_current_mode_descr}}{'x_hot'}, $self->{_cursors}{$self->{_current_mode_descr}}{'y_hot'},
);
}
if (exists $self->{_cursors}{$self->{_current_mode_descr}}) {

@DarthGandalfDarthGandalfMay 9, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mix of tabs and spaces

@Photon89Photon89May 9, 2026

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed!

@DarthGandalf

DarthGandalf commented May 9, 2026

Copy link
Copy Markdown
Member

Other than whitespaces, looks good

DarthGandalf
DarthGandalf reviewed May 9, 2026
View reviewed changes
Comment threadshare/shutter/resources/modules/Shutter/Draw/DrawingTool.pm
$self->{_cursors}{$self->{_current_mode_descr}}{'x_hot'}, $self->{_cursors}{$self->{_current_mode_descr}}{'y_hot'},
);
}
my $cursor_data = $self->{_cursors}{$self->{_current_mode_descr}};

@DarthGandalfDarthGandalfMay 9, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

still bad indent

@Photon89

Photon89 commented May 9, 2026

Copy link
Copy Markdown
MemberAuthor

Should be okay now! I guess, I need to look for a better text editor...

@Photon89
Photon89 merged commit 7796539 into masterMay 9, 2026
1 check passed
@DarthGandalf

DarthGandalf commented May 9, 2026

Copy link
Copy Markdown
Member

Should be okay now!

Nope

I need to look for a better text editor.

in nvim I have this: vim.opt.listchars = { tab = '▸ ' } which makes tab and spaces more visible

@Photon89

Photon89 commented May 9, 2026

Copy link
Copy Markdown
MemberAuthor

Sorry, I merged too fast. What is the best way to fix the last whitespace problem? A new PR?

@DarthGandalf

DarthGandalf commented May 9, 2026

Copy link
Copy Markdown
Member

That works. Dunno if it's the best one

@Photon89

Photon89 commented May 9, 2026

Copy link
Copy Markdown
MemberAuthor

Done in #814. Would you also like to review #792, #798, #806 or shall we merge them?

@Photon89
Photon89 deleted the fix-xpm-loading branch May 9, 2026 17:05
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@DarthGandalfDarthGandalfDarthGandalf approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Internal image editor does not open

2 participants

@Photon89@DarthGandalf