Skip to content

Improvements for overview plugin #1442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nnikulshin wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improvements for overview plugin #1442

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
191ae27
Two new features for the overview plugin
nnikulshin May 30, 2025
b73d2ed
Merge branch 'master' into improvements-for-overview
nnikulshin May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 36 additions & 7 deletions overview/overview/overviewscintilla.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,15 +594,18 @@ overview_scintilla_update_rect (OverviewScintilla *self)
{
GtkAllocation alloc;
GdkRectangle rect;
gint first_line, n_lines, last_line;
gint first_vis_line, n_lines, last_vis_line;
gint first_line, last_line;
gint pos_start, pos_end;
gint ystart, yend;

gtk_widget_get_allocation (GTK_WIDGET (self), &alloc);

first_line = sci_send (self->sci, GETFIRSTVISIBLELINE, 0, 0);
first_vis_line = sci_send (self->sci, GETFIRSTVISIBLELINE, 0, 0);
n_lines = sci_send (self->sci, LINESONSCREEN, 0, 0);
last_line = first_line + n_lines;
last_vis_line = first_vis_line + n_lines;
first_line = sci_send(self->sci, DOCLINEFROMVISIBLE, first_vis_line, 0);
last_line = sci_send(self->sci, DOCLINEFROMVISIBLE, last_vis_line, 0);

pos_start = sci_send (self, POSITIONFROMLINE, first_line, 0);
pos_end = sci_send (self, POSITIONFROMLINE, last_line, 0);
Expand Down Expand Up @@ -878,11 +881,35 @@ on_src_sci_notify (ScintillaObject *sci,
SCNotification *nt,
OverviewScintilla *self)
{
if (nt->nmhdr.code == SCN_UPDATEUI && nt->updated & SC_UPDATE_V_SCROLL)
if (nt->nmhdr.code == SCN_UPDATEUI)
{
overview_scintilla_sync_center (self);
if (GTK_IS_WIDGET (self->canvas))
gtk_widget_queue_draw (self->canvas);
if (nt->updated & SC_UPDATE_V_SCROLL)
{
overview_scintilla_sync_center (self);
if (GTK_IS_WIDGET (self->canvas))
gtk_widget_queue_draw (self->canvas);
}
if (nt->updated & SC_UPDATE_SELECTION)
{
int anchor = sci_send(sci, GETANCHOR, 0, 0);
int cp = sci_send(sci, GETCURRENTPOS, 0, 0);
sci_send(self, SETSEL, anchor, cp);
sci_send(sci, SETSEL, anchor, cp); // Re-select the selection in the main scintilla to make sure that it remains a primary selection.
}
}
else if (nt->nmhdr.code == SCN_MARGINCLICK)
{
sci_send(self, FOLDALL, SC_FOLDACTION_EXPAND, 0);
int currFold = -1;
while (TRUE)
{
currFold = sci_send(sci, CONTRACTEDFOLDNEXT, currFold+1, 0);
if (currFold == -1) break;
sci_send(self, FOLDLINE, currFold, SC_FOLDACTION_CONTRACT);
}
overview_scintilla_sync_center (self);
if (GTK_IS_WIDGET (self->canvas))
gtk_widget_queue_draw (self->canvas);
}
}

Expand Down Expand Up @@ -911,6 +938,8 @@ overview_scintilla_clone_styles (OverviewScintilla *self)

g_free (font_name);
}

sci_send(sci, SETELEMENTCOLOUR, SC_ELEMENT_SELECTION_INACTIVE_BACK, sci_send(src_sci, GETELEMENTCOLOUR, SC_ELEMENT_SELECTION_BACK, 0));
}

static void
Expand Down