diff options
Diffstat (limited to 'mp/src/vgui2/vgui_controls')
| -rw-r--r-- | mp/src/vgui2/vgui_controls/Panel.cpp | 2 | ||||
| -rw-r--r-- | mp/src/vgui2/vgui_controls/PanelListPanel.cpp | 4 | ||||
| -rw-r--r-- | mp/src/vgui2/vgui_controls/RadioButton.cpp | 2 | ||||
| -rw-r--r-- | mp/src/vgui2/vgui_controls/TextEntry.cpp | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/mp/src/vgui2/vgui_controls/Panel.cpp b/mp/src/vgui2/vgui_controls/Panel.cpp index 3f3634fe..369e00c4 100644 --- a/mp/src/vgui2/vgui_controls/Panel.cpp +++ b/mp/src/vgui2/vgui_controls/Panel.cpp @@ -3911,7 +3911,7 @@ void Panel::PinToSibling( const char *pszSibling, PinCorner_e pinOurCorner, PinC _pinCornerToSibling = pinOurCorner; _pinToSiblingCorner = pinSibling; - if ( _pinToSibling && pszSibling && !Q_strcmp( _pinToSibling, pszSibling ) ) + if ( m_pinSibling.Get() && _pinToSibling && pszSibling && !Q_strcmp( _pinToSibling, pszSibling ) ) return; if (_pinToSibling) diff --git a/mp/src/vgui2/vgui_controls/PanelListPanel.cpp b/mp/src/vgui2/vgui_controls/PanelListPanel.cpp index 51fe8ab9..355ac08f 100644 --- a/mp/src/vgui2/vgui_controls/PanelListPanel.cpp +++ b/mp/src/vgui2/vgui_controls/PanelListPanel.cpp @@ -24,6 +24,8 @@ using namespace vgui; +DECLARE_BUILD_FACTORY( PanelListPanel ); + //----------------------------------------------------------------------------- // Purpose: Constructor //----------------------------------------------------------------------------- @@ -135,7 +137,7 @@ Panel *PanelListPanel::GetCellRenderer( int row ) // data->GetName() is used to uniquely identify an item // data sub items are matched against column header name to be used in the table //----------------------------------------------------------------------------- -int PanelListPanel::AddItem( Panel *labelPanel, Panel *panel) +int PanelListPanel::AddItem( Panel *labelPanel, Panel *panel ) { Assert(panel); diff --git a/mp/src/vgui2/vgui_controls/RadioButton.cpp b/mp/src/vgui2/vgui_controls/RadioButton.cpp index 5d0dbeef..0b5d81d2 100644 --- a/mp/src/vgui2/vgui_controls/RadioButton.cpp +++ b/mp/src/vgui2/vgui_controls/RadioButton.cpp @@ -115,7 +115,7 @@ void RadioButton::ApplySchemeSettings(IScheme *pScheme) SetContentAlignment(a_west); // reloading the scheme wipes out lists of images - _radioBoxImage->SetFont( pScheme->GetFont("Marlett", IsProportional()) ); + _radioBoxImage->SetFont( pScheme->GetFont("MarlettSmall", IsProportional()) ); _radioBoxImage->ResizeImageToContent(); SetImageAtIndex(0, _radioBoxImage, 0); diff --git a/mp/src/vgui2/vgui_controls/TextEntry.cpp b/mp/src/vgui2/vgui_controls/TextEntry.cpp index 7a4f2d8c..825cb4ab 100644 --- a/mp/src/vgui2/vgui_controls/TextEntry.cpp +++ b/mp/src/vgui2/vgui_controls/TextEntry.cpp @@ -1637,7 +1637,7 @@ void TextEntry::OnKeyCodePressed(KeyCode code) // Pass on the joystick and mouse codes if ( IsMouseCode(code) || IsNovintButtonCode(code) || IsJoystickCode(code) || IsJoystickButtonCode(code) || - IsJoystickPOVCode(code) || IsJoystickPOVCode(code) || IsJoystickAxisCode(code) ) + IsJoystickPOVCode(code) || IsJoystickAxisCode(code) ) { Panel::OnKeyCodePressed( code ); return; |