TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 16:20:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

dgui: fix sizing after changing Slider/Scrollbar orientation

Browse Source 
Closes #700
This commit is contained in:
Fireclaw 2020-02-23 15:23:39 +01:00 committed by rdb
parent 50d27166d8
commit c73415b4ba
3 changed files with 83 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
direct/src/gui/DirectScrollBar.py
View File

@ -88,6 +88,8 @@ class DirectScrollBar(DirectFrame):
else:
self.incButton['frameSize'] = (f[0], f[1], f[2]*0.05, f[3]*0.05)
self._lastOrientation = self['orientation']
self.guiItem.setThumbButton(self.thumb.guiItem)
self.guiItem.setLeftButton(self.decButton.guiItem)
self.guiItem.setRightButton(self.incButton.guiItem)
@ -140,13 +142,38 @@ class DirectScrollBar(DirectFrame):
def setOrientation(self):
if self['orientation'] == DGG.HORIZONTAL:
if self._lastOrientation in (DGG.VERTICAL, DGG.VERTICAL_INVERTED):
fpre = self['frameSize']
# swap frameSize width and height to keep custom frameSizes
self['frameSize'] = (fpre[2], fpre[3], fpre[0], fpre[1])
f = self.decButton['frameSize']
self.decButton['frameSize'] = (f[2], f[3], f[0], f[1])
f = self.incButton['frameSize']
self.incButton['frameSize'] = (f[2], f[3], f[0], f[1])
self.guiItem.setAxis(Vec3(1, 0, 0))
elif self['orientation'] == DGG.VERTICAL:
if self._lastOrientation == DGG.HORIZONTAL:
fpre = self['frameSize']
# swap frameSize width and height to keep custom frameSizes
self['frameSize'] = (fpre[2], fpre[3], fpre[0], fpre[1])
f = self.decButton['frameSize']
self.decButton['frameSize'] = (f[2], f[3], f[0], f[1])
f = self.incButton['frameSize']
self.incButton['frameSize'] = (f[2], f[3], f[0], f[1])
self.guiItem.setAxis(Vec3(0, 0, -1))
elif self['orientation'] == DGG.VERTICAL_INVERTED:
if self._lastOrientation == DGG.HORIZONTAL:
fpre = self['frameSize']
# swap frameSize width and height to keep custom frameSizes
self['frameSize'] = (fpre[2], fpre[3], fpre[0], fpre[1])
f = self.decButton['frameSize']
self.decButton['frameSize'] = (f[2], f[3], f[0], f[1])
f = self.incButton['frameSize']
self.incButton['frameSize'] = (f[2], f[3], f[0], f[1])
self.guiItem.setAxis(Vec3(0, 0, 1))
else:
raise ValueError('Invalid value for orientation: %s' % (self['orientation']))
self._lastOrientation = self['orientation']
def setManageButtons(self):
self.guiItem.setManagePieces(self['manageButtons'])

28
direct/src/gui/DirectSlider.py
View File

@ -41,7 +41,7 @@ class DirectSlider(DirectFrame):
('extraArgs', [], None),
)
if kw.get('orientation') == DGG.VERTICAL:
if kw.get('orientation') in (DGG.VERTICAL, DGG.VERTICAL_INVERTED):
# These are the default options for a vertical layout.
optiondefs += (
('frameSize', (-0.08, 0.08, -1, 1), None),
@ -72,6 +72,8 @@ class DirectSlider(DirectFrame):
else:
self.thumb['frameSize'] = (f[0], f[1], f[2]*0.05, f[3]*0.05)
self._lastOrientation = self['orientation']
self.guiItem.setThumbButton(self.thumb.guiItem)
# Bind command function
@ -115,11 +117,35 @@ class DirectSlider(DirectFrame):
def setOrientation(self):
if self['orientation'] == DGG.HORIZONTAL:
if self._lastOrientation in (DGG.VERTICAL, DGG.VERTICAL_INVERTED):
fpre = self['frameSize']
# swap frameSize width and height to keep custom frameSizes
self['frameSize'] = (fpre[2], fpre[3], fpre[0], fpre[1])
tf = self.thumb['frameSize']
self.thumb['frameSize'] = (tf[2], tf[3], tf[0], tf[1])
self.guiItem.setAxis(Vec3(1, 0, 0))
self['frameVisibleScale'] = (1, 0.25)
elif self['orientation'] == DGG.VERTICAL:
if self._lastOrientation == DGG.HORIZONTAL:
fpre = self['frameSize']
# swap frameSize width and height to keep custom frameSizes
self['frameSize'] = (fpre[2], fpre[3], fpre[0], fpre[1])
tf = self.thumb['frameSize']
self.thumb['frameSize'] = (tf[2], tf[3], tf[0], tf[1])
self.guiItem.setAxis(Vec3(0, 0, 1))
self['frameVisibleScale'] = (0.25, 1)
elif self['orientation'] == DGG.VERTICAL_INVERTED:
if self._lastOrientation == DGG.HORIZONTAL:
fpre = self['frameSize']
# swap frameSize width and height to keep custom frameSizes
self['frameSize'] = (fpre[2], fpre[3], fpre[0], fpre[1])
tf = self.thumb['frameSize']
self.thumb['frameSize'] = (tf[2], tf[3], tf[0], tf[1])
self.guiItem.setAxis(Vec3(0, 0, -1))
self['frameVisibleScale'] = (0.25, 1)
else:
raise ValueError('Invalid value for orientation: %s' % (self['orientation']))
self._lastOrientation = self['orientation']
def destroy(self):
if (hasattr(self, 'thumb')):

29
tests/gui/test_DirectSlider.py Normal file
View File

@ -0,0 +1,29 @@
from direct.gui.DirectSlider import DirectSlider
from direct.gui import DirectGuiGlobals as DGG
import pytest
def test_slider_orientation():
slider = DirectSlider()
# Horizontal orientation is the default
assert slider['orientation'] == DGG.HORIZONTAL
assert slider['frameSize'] == (-1, 1, -0.08, 0.08)
assert slider['frameVisibleScale'] == (1, 0.25)
# try change to vertical orientation
slider['orientation'] = DGG.VERTICAL
assert slider['orientation'] == DGG.VERTICAL
assert slider['frameSize'] == (-0.08, 0.08, -1, 1)
assert slider['frameVisibleScale'] == (0.25, 1)
# back to horizontal
slider['orientation'] = DGG.HORIZONTAL
assert slider['orientation'] == DGG.HORIZONTAL
assert slider['frameSize'] == (-1, 1, -0.08, 0.08)
assert slider['frameVisibleScale'] == (1, 0.25)
# finally change to inverted vertical orientation
slider['orientation'] = DGG.VERTICAL_INVERTED
assert slider['orientation'] == DGG.VERTICAL_INVERTED
assert slider['frameSize'] == (-0.08, 0.08, -1, 1)
assert slider['frameVisibleScale'] == (0.25, 1)