[RHEL 7.2/PATCH] Keyboard Scroll Fails in Viewports (rhbz#1189899)

David Shea dshea at redhat.com
Tue Jun 2 20:21:02 UTC 2015


On 06/02/2015 04:18 PM, Robert Marshall wrote:
> +#<<<<<<< HEAD
>           # Populate the list of valid filesystem types from the format classes.
>           # Unfortunately, we have to narrow them down a little bit more because
>           # this list will include things like PVs and RAID members.
>           self._fsCombo.remove_all()
> +#=======
> +        # Connect viewport scrolling with accordion focus events
> +        self._accordion.set_focus_hadjustment(self._partitionsViewport.get_hadjustment())
> +        self._accordion.set_focus_vadjustment(self._partitionsViewport.get_vadjustment())
> +#>>>>>>> 35324b3... Connect viewport adjustments to child focus adjustments (#1192155)

This conflict isn't resolved. I haven't looked at the origin of the 
remove_all line, but my guess is that you need that as well as the 
viewport changes.


More information about the anaconda-patches mailing list