Skip to content

[FIX] OWWidget: Move 'splitter' to private members #2847

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

Merged
janezd merged 1 commit into from
Jan 8, 2018
Merged

[FIX] OWWidget: Move 'splitter' to private members #2847

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions Orange/widgets/widget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ def __new__(cls, *args, captionTitle=None, **kwargs):

self.left_side = None
self.controlArea = self.mainArea = self.buttonsArea = None
self.splitter = None
self.__splitter = None
if self.want_basic_layout:
self.set_basic_layout()

Expand All @@ -234,13 +234,13 @@ def __new__(cls, *args, captionTitle=None, **kwargs):
# Otherwise, the first control has focus
self.controlArea.setFocus(Qt.ActiveWindowFocusReason)

if self.splitter is not None:
self.splitter.controlAreaVisibilityChanged.connect(
if self.__splitter is not None:
self.__splitter.controlAreaVisibilityChanged.connect(
self.storeControlAreaVisibility)
sc = QShortcut(
QKeySequence(Qt.ControlModifier | Qt.ShiftModifier | Qt.Key_D),
self)
sc.activated.connect(self.splitter.flip)
sc.activated.connect(self.__splitter.flip)
return self

# pylint: disable=super-init-not-called
Expand Down Expand Up @@ -316,12 +316,12 @@ def mouseMoveEvent(self, event):
return

def _insert_splitter(self):
self.splitter = self._Splitter(Qt.Horizontal, self)
self.layout().addWidget(self.splitter)
self.__splitter = self._Splitter(Qt.Horizontal, self)
self.layout().addWidget(self.__splitter)

def _insert_control_area(self):
self.left_side = gui.vBox(self.splitter, spacing=0)
self.splitter.setSizes([1]) # Smallest size allowed by policy
self.left_side = gui.vBox(self.__splitter, spacing=0)
self.__splitter.setSizes([1]) # Smallest size allowed by policy
if self.buttons_area_orientation is not None:
self.controlArea = gui.vBox(self.left_side, addSpace=0)
self._insert_buttons_area()
Expand All @@ -342,12 +342,12 @@ def _insert_buttons_area(self):

def _insert_main_area(self):
self.mainArea = gui.vBox(
self.splitter, margin=4,
self.__splitter, margin=4,
sizePolicy=QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
)
self.splitter.addWidget(self.mainArea)
self.splitter.setCollapsible(
self.splitter.indexOf(self.mainArea), False)
self.__splitter.addWidget(self.mainArea)
self.__splitter.setCollapsible(
self.__splitter.indexOf(self.mainArea), False)
self.mainArea.layout().setContentsMargins(
0 if self.want_control_area else 4, 4, 4, 4)

Expand Down Expand Up @@ -572,7 +572,7 @@ def showEvent(self, event):
QDialog.showEvent(self, event)
if self.save_position and not self.__was_restored:
# Restore saved geometry on (first) show
self.splitter.setControlAreaVisible(self.controlAreaVisible)
self.__splitter.setControlAreaVisible(self.controlAreaVisible)
self.__restoreWidgetGeometry()
self.__was_restored = True
self.__quicktipOnce()
Expand Down