Skip to content
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.

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

fix missing scroll bar in view source #603

Merged
merged 1 commit into from
Nov 4, 2015

Conversation

quozl
Copy link
Contributor

@quozl quozl commented Nov 3, 2015

On Fedora 18, scroll bars were missing, see 4903. On Fedora 20, impossible arguments were given to X server, resulting in desktop instability, see 12872.

Regression introduced in 4be3f9e and 4273, in the SourceDisplay class, where a GtkBox is inserted between the GtkScrolledWindow and any child.

Fix is

@samdroid-apps
Copy link
Contributor

Still results in X crashing for me on fc20. Happens after it loads the source, but same as before (it loads the code, then it loads more signalled by the scroll bar getting smaller, then crash). Tested on the evil moon activity that caused a crash before.

I'm not sure if this patch was meant to fix that, maybe don't include it in the commit message if it wasn't?

Otherwise, it doesn't break sugar on fc24 and looks good to me code wise.

@quozl
Copy link
Contributor Author

quozl commented Nov 4, 2015

Interesting, thanks for the test. I've tested again just now on Fedora 20, and can't fault it. With Moon, Memorize, Measure and Maze.

Can you please confirm you have a file /usr/lib/python2.7/site-packages/jarabe/view/viewsource.py with md5sum 3585f26e8afdf99f6ed718b0a597c77d?

Can you please save "rpm -qa | sort" into a gist or pastebin and link here? My test system package list is here.

On Fedora 18, scroll bars were missing, #4903.

On Fedora 20, impossible arguments were given to X server, resulting in
desktop instability.  dev.laptop.org #12872.

Regression introduced in 4be3f9e and #4273, in the SourceDisplay class,
where a GtkBox is inserted between the GtkScrolledWindow and any child.

Fix is

- remove GtkBox intermediary; unnecessary,

- add methods for managing a single child of the GtkScrolledWindow,
  which will be either a GtkSourceView or a GtkEventBox in a
  GtkViewport,

- remove some GtkWidget.show calls; made redundant by .show_all,
@quozl
Copy link
Contributor Author

quozl commented Nov 4, 2015

Rebased.

@samdroid-apps
Copy link
Contributor

Works great on fc20 XO4. Merging

@samdroid-apps samdroid-apps merged commit d6cc2de into sugarlabs:master Nov 4, 2015
@quozl quozl deleted the 4903-b branch September 11, 2019 03:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants