@rodrigo1406: no, it's not merged yet. See #2339.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/1697#issuecomment-616619190
Can anyone please tell me if it's been implemented or not? I'm using Geany 1.33
on Debian 10, and don't see it.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/1697#issuecomment-616308778
> Bah, forget it. This is dead now. Move on.
Ok, will wait for #2339 to be merged.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/1697#issuecomment-542516427
> But I already pushed again to showzoom before trying to re-open this PR.
For future reference:
https://gist.github.com/robertpainsi/2c42c15f1ce6dab03a0675348edd4e2c
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://
Bah, forget it. This is dead now. Move on.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/1697#issuecomment-542422574
> Most likely it's done that since you created a second PR with the same
> branch. You could try and close the second one and I suspect the "Re-open"
> option will become active again for this PR.
The second/other PR is from another branch ```showzoom2```. But I already
pushed again to ```showz
> Update: I see the Reopen pull request button but it is grayed out.
Most likely it's done that since you created a second PR with the same branch.
You could try and close the second one and I suspect the "Re-open" option will
become active again for this PR.
--
You are receiving this because
I pushed to showzoom again and I hopefully have restored the branch but I do
not see it here since it's already closed.
How can I re-open this PR? Github only let's me create a new PR from
```LarsGit223:showzoom```. Would that re-open this one?
--
You are receiving this because you are subscri
> Now I got the new PR open anyway so I will keep that.
Alternatively, you could close the duplicate PR and update this one which has
reviews and comments.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/
@codebrainz: thanks, did not know that I can rename branches. I'll try to
remeber that if I get to the same situation again. Now I got the new PR open
anyway so I will keep that.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitH
If you name the new branch `showzoom` and force push it, it will update the
original PR.
For example:
```bash
$ git branch -m showzoom showzoom-messed-up
$ git branch -m showzoom2 showzoom
$ git push +showzoom
```
--
You are receiving this because you are subscribed to this thread.
Reply to t
#2339 is not a fix of this branch, I just checked out master and applied the
changes.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/1697#issuecomment-538672669
Since you managed to fix it (as per #2339), you could've force pushed it back
to your fork/remote to update this PR. As long as you push to the same remote
branch the PR is made for, Github should update the original PR fine.
--
You are receiving this because you are subscribed to this thread.
@codebrainz: I mixed up the commit history.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/1697#issuecomment-538667634
> Sorry, broke it.
What does that mean? AFAIK you can't break a PR.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/1697#issuecomment-53891
Do not merge this, closing in favor of #2339.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/1697#issuecomment-538641738
Closed #1697.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/1697#event-2689249777
Sorry, broke it. Will post another clean PR.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/1697#issuecomment-538640073
I will try to squash it myself.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/1697#issuecomment-538637393
b4n approved this pull request.
LGTM, and it works fine.
Only thing is that I'd like to squash the commits I think as part of the second
relevant commit is fixups on the first one, but I can also do that when merging
if you'd like.
--
You are receiving this because you are subscribed to thi
LarsGit223 commented on this pull request.
> +gint sci_get_fontsize(ScintillaObject *sci, gint style)
+{
+ return (gint) SSM(sci, SCI_STYLEGETSIZE, (uptr_t) style, 0);
+}
Changed and tested. Now looks like your code snippet below.
--
You are receiving this because you are subscribed to
LarsGit223 commented on this pull request.
> @@ -218,6 +219,8 @@ void
> sci_move_selected_lines_up (ScintillaObject *sci);
void sci_set_font_fractional
(ScintillaObject *sci, gint style, const gchar *font, gdouble size);
@LarsGit223 pushed 1 commit.
e7b9ece9256e0f890899eb06aa52313290b7cacf sciwrappers: use fractional size in
'sci_get_font_size()'
--
You are receiving this because you are subscribed to this thread.
View it on GitHub:
https://github.com/geany/geany/pull/1697/files/9ea258374dfb791e19af46c354a01b
LarsGit223 commented on this pull request.
> @@ -304,6 +305,21 @@ static gchar *create_statusbar_statistics(GeanyDocument
> *doc,
g_string_append_printf(stats_str, "%d",
sci_get_style_at(doc->editor->sci,
pos));
b4n commented on this pull request.
> @@ -304,6 +305,21 @@ static gchar *create_statusbar_statistics(GeanyDocument
> *doc,
g_string_append_printf(stats_str, "%d",
sci_get_style_at(doc->editor->sci,
pos));
I suggest something like this
```diff
diff --git a/src/sciwrappers.c b/src/sciwrappers.c
index 647c44454..5dc59b93e 100644
--- a/src/sciwrappers.c
+++ b/src/sciwrappers.c
@@ -968,9 +968,9 @@ void sci_set_font(ScintillaObject *sci, gint style, const
gchar *font, gint size
}
-gint sci_get_fonts
b4n requested changes on this pull request.
Apart from that function name and using fractional sizes, looks pretty good to
me.
> +gint sci_get_fontsize(ScintillaObject *sci, gint style)
+{
+ return (gint) SSM(sci, SCI_STYLEGETSIZE, (uptr_t) style, 0);
+}
I would still like to see the func
@b4n ping, its your review.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/1697#issuecomment-537720414
Can this be merged? I just resolved the conflicts.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/1697#issuecomment-537629699
@LarsGit223 pushed 1 commit.
9ea258374dfb791e19af46c354a01bbdcc4f5a31 Merge branch 'master' into showzoom
--
You are receiving this because you are subscribed to this thread.
View it on GitHub:
https://github.com/geany/geany/pull/1697/files/9510042013e1fe0c476c25dce6f1183cb52c85b6..9ea258374df
@b4n: ping. Could this be merged now?
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/1697#issuecomment-520246757
@kugel-: maybe post that also as an idea/feature request in a separate issue.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/1697#issuecomment-513277375
As a follow up, I would like to see that we can also change stuff through the
status bar (via a pop-up menu or so), similar to Gedit. Such as the line
endings, indentation width, etc. If this also includes the zoom label, then we
need a way to show that always I guess. Can we reserve %Z for that
LarsGit223 commented on this pull request.
> @@ -305,6 +306,21 @@ static gchar *create_statusbar_statistics(GeanyDocument
> *doc,
g_string_append_printf(stats_str, "%d",
sci_get_style_at(doc->editor->sci,
pos));
LarsGit223 commented on this pull request.
> @@ -82,6 +82,7 @@ gchar sci_get_char_at
> (ScintillaObject *sci, gint pos);
void sci_scroll_caret
(ScintillaObject *sci);
gint
b4n requested changes on this pull request.
Looks good apart from the comments below
> @@ -82,6 +82,7 @@ gchar sci_get_char_at
> (ScintillaObject *sci, gint pos);
void sci_scroll_caret
(Scint
Ping. Does this have a chance to be merged sometime?
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/1697#issuecomment-511521184
LarsGit223 commented on this pull request.
> @@ -954,6 +958,17 @@ void sci_set_font(ScintillaObject *sci, gint style,
> const gchar *font, gint size
}
+/** Gets the font size for a particular style.
+ * @param sci Scintilla widget.
+ * @param style The style.
+ * @return The font size. */
LarsGit223 commented on this pull request.
> @@ -322,6 +322,10 @@ void sci_zoom_off(ScintillaObject *sci)
SSM(sci, SCI_SETZOOM, 0, 0);
}
+gint sci_zoom_get(ScintillaObject *sci)
Done (long time ago).
--
You are receiving this because you are subscribed to this thread.
Reply to this
I squashed the commits, if any more changes are requested please let me know.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/1697#issuecomment-373907914
@b4n, @codebrainz: ping: any remarks left? If not I will squash commits
together to clean up the history.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/1697#issuecomment-360278711
LGBI
When approved the commits need to be squashed to remove the tab attempt.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/1697#issuecomment-352291754
A little update:
- I moved the displaying of the zoom level to the status bar, the specifier is
**%z**
- the behaviour is still the same:
- if the zoom level is != 100% then e.g. ```Zoom: 110%``` will be displayed
- if the zoom level is == 100% then nothing will be displayed
- I updated the do
43 matches
Mail list logo
