Skip to content

Commit

Permalink
Both:
Browse files Browse the repository at this point in the history 
 - Moved column to style preset from arrangement (makes more sense there for now)

StylePresets:
 - Renamed variables

ArrangementPresets:
 - Moved some code around for readability
  • Loading branch information
@AdamWillden
AdamWillden committed Oct 14, 2020
1 parent afe14fd commit 6276598
Show file tree
Hide file tree
Showing 4 changed files with 86 additions and 73 deletions.
111 changes: 57 additions & 54 deletions cl_dll/ff/vgui/ff_customhudoptions_arrangementpresets.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace vgui
CFFCustomHudArrangementPresets::CFFCustomHudArrangementPresets(Panel *parent, char const *panelName, char const *pszComboBoxName) : BaseClass(parent, panelName, pszComboBoxName, ARRANGEMENTPRESET_FILE)
{
m_pPanelRed = new CFFInputSlider(this, "PanelRed", "PanelRedInput");
m_pPanelRed->SetRange(0, 255);
m_pPanelRed->SetRange(0, 255);
m_pPanelRed->SetValue(255);

m_pPanelGreen = new CFFInputSlider(this, "PanelGreen", "PanelGreenInput");
Expand Down Expand Up @@ -84,10 +84,6 @@ namespace vgui
m_pShowPanel = new CheckButton(this, "ShowPanel", "#GameUI_Show");
m_pPanelColorCustom = new CheckButton(this, "PanelColorCustom", "#GameUI_CustomColor");

m_pColumns = new CFFInputSlider(this, "Columns", "ColumnsInput");
m_pColumns->SetRange(1, 6);
m_pColumns->SetValue(1);

LoadControlSettings("resource/ui/FFOptionsSubCustomHudArrangementPresets.res");
}

Expand All @@ -99,28 +95,30 @@ namespace vgui

void CFFCustomHudArrangementPresets::SetControlsEnabled(bool bEnabled)
{
m_pColumns->SetEnabled( bEnabled );
m_pItemsX->SetEnabled( bEnabled );
m_pItemsY->SetEnabled( bEnabled );
m_pHeaderTextSize->SetEnabled( bEnabled );
m_pHeaderTextX->SetEnabled( bEnabled );
m_pHeaderTextY->SetEnabled( bEnabled );
m_pHeaderIconSize->SetEnabled( bEnabled );
m_pHeaderIconX->SetEnabled( bEnabled );
m_pHeaderIconY->SetEnabled( bEnabled );
m_pTextSize->SetEnabled( bEnabled );
m_pTextX->SetEnabled( bEnabled );
m_pTextY->SetEnabled( bEnabled );
m_pItemsX->SetEnabled( bEnabled );
m_pItemsY->SetEnabled( bEnabled );

m_pHeaderTextSize->SetEnabled( bEnabled );
m_pHeaderIconSize->SetEnabled( bEnabled );
m_pTextSize->SetEnabled( bEnabled );

m_pShowHeaderIcon->SetEnabled( bEnabled );
m_pShowHeaderText->SetEnabled( bEnabled );
m_pShowText->SetEnabled( bEnabled );

m_pHeaderIconShadow->SetEnabled( bEnabled );
m_pHeaderTextShadow->SetEnabled( bEnabled );
m_pTextShadow->SetEnabled( bEnabled );

m_pShowPanel->SetEnabled( bEnabled );
m_pPanelColorCustom->SetEnabled( bEnabled );


//if we're disabling
if(!bEnabled)
//disable all
Expand All @@ -134,14 +132,10 @@ namespace vgui
else
//only enable based upon what is selected for custom panel colour
{
if(m_pPanelColorCustom->IsSelected())
{
m_pPanelRed->SetEnabled( bEnabled );
m_pPanelGreen->SetEnabled( bEnabled );
m_pPanelBlue->SetEnabled( bEnabled );
m_pPanelAlpha->SetEnabled( bEnabled );
}
//TODO: else might need to force false - might be sensible but not necessary??
m_pPanelRed->SetEnabled( m_pPanelColorCustom->IsSelected() );
m_pPanelGreen->SetEnabled( m_pPanelColorCustom->IsSelected() );
m_pPanelBlue->SetEnabled( m_pPanelColorCustom->IsSelected() );
m_pPanelAlpha->SetEnabled( m_pPanelColorCustom->IsSelected() );
}
}
//-----------------------------------------------------------------------------
Expand All @@ -160,24 +154,27 @@ namespace vgui
{
KeyValues *kvTemp = new KeyValues(kvPreset->GetName());

kvTemp->SetInt("columns", kvPreset->GetInt("columns", 2));
kvTemp->SetInt("itemsX", kvPreset->GetInt("itemsX", 5));
kvTemp->SetInt("itemsY", kvPreset->GetInt("itemsY", 20));
kvTemp->SetInt("showHeaderText", kvPreset->GetInt("showHeaderText", 1));
kvTemp->SetInt("headerTextShadow", kvPreset->GetInt("headerTextShadow", 0));
kvTemp->SetInt("headerTextSize", kvPreset->GetInt("headerTextSize", 3));
kvTemp->SetInt("headerTextX", kvPreset->GetInt("headerTextX", 20));
kvTemp->SetInt("headerTextY", kvPreset->GetInt("headerTextY", 7));
kvTemp->SetInt("showHeaderIcon", kvPreset->GetInt("showHeaderIcon", 1));
kvTemp->SetInt("headerIconShadow", kvPreset->GetInt("headerIconShadow", 0));
kvTemp->SetInt("headerIconSize", kvPreset->GetInt("headerIconSize", 3));
kvTemp->SetInt("headerIconX", kvPreset->GetInt("headerIconX", 3));
kvTemp->SetInt("headerIconY", kvPreset->GetInt("headerIconY", 3));
kvTemp->SetInt("showText", kvPreset->GetInt("showText", 1));
kvTemp->SetInt("textShadow", kvPreset->GetInt("textShadow", 0));
kvTemp->SetInt("textSize", kvPreset->GetInt("textSize", 3));
kvTemp->SetInt("textX", kvPreset->GetInt("textX", 25));
kvTemp->SetInt("textY", kvPreset->GetInt("textY", 20));
kvTemp->SetInt("itemsX", kvPreset->GetInt("itemsX", 5));
kvTemp->SetInt("itemsY", kvPreset->GetInt("itemsY", 20));

kvTemp->SetInt("showHeaderText", kvPreset->GetInt("showHeaderText", 1));
kvTemp->SetInt("showHeaderIcon", kvPreset->GetInt("showHeaderIcon", 1));
kvTemp->SetInt("showText", kvPreset->GetInt("showText", 1));

kvTemp->SetInt("headerTextSize", kvPreset->GetInt("headerTextSize", 3));
kvTemp->SetInt("headerIconSize", kvPreset->GetInt("headerIconSize", 3));
kvTemp->SetInt("textSize", kvPreset->GetInt("textSize", 3));

kvTemp->SetInt("headerTextShadow", kvPreset->GetInt("headerTextShadow", 0));
kvTemp->SetInt("headerIconShadow", kvPreset->GetInt("headerIconShadow", 0));
kvTemp->SetInt("textShadow", kvPreset->GetInt("textShadow", 0));

kvTemp->SetInt("showPanel", kvPreset->GetInt("showPanel", 1));
kvTemp->SetInt("panelColorCustom", kvPreset->GetInt("panelColorCustom", 0));
kvTemp->SetInt("panelRed", kvPreset->GetInt("panelRed", 255));
Expand All @@ -195,24 +192,27 @@ namespace vgui
{
BaseClass::UpdatePresetFromControls(kvPreset);

kvPreset->SetInt("columns", m_pColumns->GetValue());
kvPreset->SetInt("itemsX", m_pItemsX->GetValue());
kvPreset->SetInt("itemsY", m_pItemsY->GetValue());
kvPreset->SetInt("showHeaderText", m_pShowHeaderText->IsSelected());
kvPreset->SetInt("headerTextShadow", m_pHeaderTextShadow->IsSelected());
kvPreset->SetInt("headerTextSize", m_pHeaderTextSize->GetValue() - 1);
kvPreset->SetInt("headerTextX", m_pHeaderTextX->GetValue());
kvPreset->SetInt("headerTextY", m_pHeaderTextY->GetValue());
kvPreset->SetInt("showHeaderIcon", m_pShowHeaderIcon->IsSelected());
kvPreset->SetInt("headerIconShadow", m_pHeaderIconShadow->IsSelected());
kvPreset->SetInt("headerIconSize", m_pHeaderIconSize->GetValue() - 1);
kvPreset->SetInt("headerIconX", m_pHeaderIconX->GetValue());
kvPreset->SetInt("headerIconY", m_pHeaderIconY->GetValue());
kvPreset->SetInt("showText", m_pShowText->IsSelected());
kvPreset->SetInt("textShadow", m_pTextShadow->IsSelected());
kvPreset->SetInt("textSize", m_pTextSize->GetValue() - 1);
kvPreset->SetInt("textX", m_pTextX->GetValue());
kvPreset->SetInt("textY", m_pTextY->GetValue());
kvPreset->SetInt("itemsX", m_pItemsX->GetValue());
kvPreset->SetInt("itemsY", m_pItemsY->GetValue());

kvPreset->SetInt("headerTextSize", m_pHeaderTextSize->GetValue() - 1);
kvPreset->SetInt("headerIconSize", m_pHeaderIconSize->GetValue() - 1);
kvPreset->SetInt("textSize", m_pTextSize->GetValue() - 1);

kvPreset->SetInt("showHeaderText", m_pShowHeaderText->IsSelected());
kvPreset->SetInt("showHeaderIcon", m_pShowHeaderIcon->IsSelected());
kvPreset->SetInt("showText", m_pShowText->IsSelected());

kvPreset->SetInt("headerTextShadow", m_pHeaderTextShadow->IsSelected());
kvPreset->SetInt("headerIconShadow", m_pHeaderIconShadow->IsSelected());
kvPreset->SetInt("textShadow", m_pTextShadow->IsSelected());

kvPreset->SetInt("showPanel", m_pShowPanel->IsSelected());
kvPreset->SetInt("panelColorCustom", m_pPanelColorCustom->IsSelected());
kvPreset->SetInt("panelRed", m_pPanelRed->GetValue());
Expand All @@ -231,24 +231,27 @@ namespace vgui
m_bPresetLoading = true;
//this disables the preset options from registering these changes as a preset update!

m_pColumns->SetValue(kvPreset->GetInt("columns", 2));
m_pItemsX->SetValue(kvPreset->GetInt("itemsX", 5));
m_pItemsY->SetValue(kvPreset->GetInt("itemsY", 20));
m_pShowHeaderText->SetSelected(kvPreset->GetInt("showHeaderText", 1));
m_pHeaderTextShadow->SetSelected(kvPreset->GetInt("headerTextShadow", 0));
m_pHeaderTextSize->SetValue(kvPreset->GetInt("headerTextSize", 3) + 1);
m_pHeaderTextX->SetValue(kvPreset->GetInt("headerTextX", 20));
m_pHeaderTextY->SetValue(kvPreset->GetInt("headerTextY", 7));
m_pShowHeaderIcon->SetSelected(kvPreset->GetInt("showHeaderIcon", 1));
m_pHeaderIconShadow->SetSelected(kvPreset->GetInt("headerIconShadow", 0));
m_pHeaderIconSize->SetValue(kvPreset->GetInt("headerIconSize", 3) + 1);
m_pHeaderIconX->SetValue(kvPreset->GetInt("headerIconX", 3));
m_pHeaderIconY->SetValue(kvPreset->GetInt("headerIconY", 3));
m_pShowText->SetSelected(kvPreset->GetInt("showText", 1));
m_pTextShadow->SetSelected(kvPreset->GetInt("textShadow", 0));
m_pTextSize->SetValue(kvPreset->GetInt("textSize", 3) + 1);
m_pTextX->SetValue(kvPreset->GetInt("textX", 25));
m_pTextY->SetValue(kvPreset->GetInt("textY", 20));

m_pShowHeaderText->SetSelected(kvPreset->GetInt("showHeaderText", 1));
m_pShowHeaderIcon->SetSelected(kvPreset->GetInt("showHeaderIcon", 1));
m_pShowText->SetSelected(kvPreset->GetInt("showText", 1));

m_pHeaderTextSize->SetValue(kvPreset->GetInt("headerTextSize", 3) + 1);
m_pHeaderIconSize->SetValue(kvPreset->GetInt("headerIconSize", 3) + 1);
m_pTextSize->SetValue(kvPreset->GetInt("textSize", 3) + 1);

m_pHeaderTextShadow->SetSelected(kvPreset->GetInt("headerTextShadow", 0));
m_pHeaderIconShadow->SetSelected(kvPreset->GetInt("headerIconShadow", 0));
m_pTextShadow->SetSelected(kvPreset->GetInt("textShadow", 0));

m_pShowPanel->SetSelected(kvPreset->GetInt("showPanel", 1));
m_pPanelColorCustom->SetSelected(kvPreset->GetInt("panelColorCustom", 0));
m_pPanelRed->SetValue(kvPreset->GetInt("panelRed", 255));
Expand Down
4 changes: 1 addition & 3 deletions cl_dll/ff/vgui/ff_customhudoptions_arrangementpresets.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,8 @@ namespace vgui
// Purpose: Catch the checkbox selection changes
//-----------------------------------------------------------------------------
MESSAGE_FUNC_PARAMS(OnUpdateCheckbox, "CheckButtonChecked", data);
private:
CFFInputSlider *m_pColumns;

ComboBox *m_pPanelColorMode;
private:

CFFInputSlider *m_pItemsX, *m_pItemsY;
CFFInputSlider *m_pHeaderTextX, *m_pHeaderTextY;
Expand Down
37 changes: 23 additions & 14 deletions cl_dll/ff/vgui/ff_customhudoptions_stylepresets.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,17 @@ namespace vgui
m_pBarBorderWidth->SetRange(1, 5);
m_pBarBorderWidth->SetValue(1);

m_pBarMarginHorizontal = new CFFInputSlider(this, "BarMarginHorizontal", "BarMarginHorizontalInput");
m_pBarMarginHorizontal->SetRange(0, 20);
m_pBarMarginHorizontal->SetValue(5);
m_pItemMarginHorizontal = new CFFInputSlider(this, "ItemMarginHorizontal", "ItemMarginHorizontalInput");
m_pItemMarginHorizontal->SetRange(0, 20);
m_pItemMarginHorizontal->SetValue(5);

m_pBarMarginVertical = new CFFInputSlider(this, "BarMarginVertical", "BarMarginVerticalInput");
m_pBarMarginVertical->SetRange(0, 20);
m_pBarMarginVertical->SetValue(5);
m_pItemMarginVertical = new CFFInputSlider(this, "ItemMarginVertical", "ItemMarginVerticalInput");
m_pItemMarginVertical->SetRange(0, 20);
m_pItemMarginVertical->SetValue(5);

m_pItemColumns = new CFFInputSlider(this, "Columns", "ColumnsInput");
m_pItemColumns->SetRange(1, 12);
m_pItemColumns->SetValue(1);

m_pSizeLabel = new Label(this, "SizeLabel", "#GameUI_Size");
m_pTextLabel = new Label(this, "TextLabel", "#GameUI_Text");
Expand Down Expand Up @@ -160,11 +164,12 @@ namespace vgui

void CFFCustomHudStylePresets::SetControlsEnabled(bool bEnabled)
{
m_pItemColumns->SetEnabled( bEnabled );
m_pBarWidth->SetEnabled( bEnabled );
m_pBarHeight->SetEnabled( bEnabled );
m_pBarBorderWidth->SetEnabled( bEnabled );
m_pBarMarginHorizontal->SetEnabled( bEnabled );
m_pBarMarginVertical->SetEnabled( bEnabled );
m_pItemMarginHorizontal->SetEnabled( bEnabled );
m_pItemMarginVertical->SetEnabled( bEnabled );
m_pBarOrientation->SetEnabled( bEnabled );

m_pComponentSelection->SetEnabled( bEnabled );
Expand Down Expand Up @@ -222,11 +227,12 @@ namespace vgui
{
KeyValues *kvTemp = new KeyValues(kvPreset->GetName());

kvTemp->SetInt("itemColumns", kvPreset->GetInt("itemColumns", 2));
kvTemp->SetInt("barWidth", kvPreset->GetInt("barWidth", 60));
kvTemp->SetInt("barHeight", kvPreset->GetInt("barHeight", 10));
kvTemp->SetInt("barBorderWidth", kvPreset->GetInt("barBorderWidth", 1));
kvTemp->SetInt("barMarginHorizontal", kvPreset->GetInt("barMarginHorizontal", 10));
kvTemp->SetInt("barMarginVertical", kvPreset->GetInt("barMarginVertical", 10));
kvTemp->SetInt("itemMarginHorizontal", kvPreset->GetInt("itemMarginHorizontal", 10));
kvTemp->SetInt("itemMarginVertical", kvPreset->GetInt("itemMarginVertical", 10));
kvTemp->SetInt("barOrientation", kvPreset->GetInt("barOrientation", 0));

//see if component data exists
Expand Down Expand Up @@ -479,6 +485,7 @@ namespace vgui
kvComponent->SetInt("green", m_pGreen->GetValue());
kvComponent->SetInt("blue", m_pBlue->GetValue());
kvComponent->SetInt("alpha", m_pAlpha->GetValue());

if(m_pShadow->IsEnabled())
kvComponent->SetInt("shadow", m_pShadow->IsSelected());
if(m_pSize->IsEnabled())
Expand Down Expand Up @@ -513,9 +520,10 @@ namespace vgui
kvPreset->SetInt("barWidth", m_pBarWidth->GetValue());
kvPreset->SetInt("barHeight", m_pBarHeight->GetValue());
kvPreset->SetInt("barBorderWidth", m_pBarBorderWidth->GetValue());
kvPreset->SetInt("barMarginHorizontal", m_pBarMarginHorizontal->GetValue());
kvPreset->SetInt("barMarginVertical", m_pBarMarginVertical->GetValue());
kvPreset->SetInt("itemMarginHorizontal", m_pItemMarginHorizontal->GetValue());
kvPreset->SetInt("itemMarginVertical", m_pItemMarginVertical->GetValue());
kvPreset->SetInt("barOrientation", m_pBarOrientation->GetActiveItem());
kvPreset->SetInt("itemColumns", m_pItemColumns->GetValue());
}

//TODO: send preset to preview
Expand All @@ -532,9 +540,10 @@ namespace vgui
m_pBarWidth->SetValue(kvPreset->GetInt("barWidth", 60));
m_pBarHeight->SetValue(kvPreset->GetInt("barHeight", 10));
m_pBarBorderWidth->SetValue(kvPreset->GetInt("barBorderWidth", 1));
m_pBarMarginHorizontal->SetValue(kvPreset->GetInt("barMarginHorizontal", 10));
m_pBarMarginVertical->SetValue(kvPreset->GetInt("barMarginVertical", 10));
m_pBarOrientation->ActivateItemByRow(kvPreset->GetInt("barOrientation", 0));
m_pItemMarginHorizontal->SetValue(kvPreset->GetInt("itemMarginHorizontal", 10));
m_pItemMarginVertical->SetValue(kvPreset->GetInt("itemMarginVertical", 10));
m_pItemColumns->SetValue(kvPreset->GetInt("itemColumns", 2));

int iMenuItemToShow = 0;

Expand Down
7 changes: 5 additions & 2 deletions cl_dll/ff/vgui/ff_customhudoptions_stylepresets.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ namespace vgui
void UpdateComponentControls(KeyValues *kvComponent);

private:

//-----------------------------------------------------------------------------
// Purpose: Catch the sliders moving
//-----------------------------------------------------------------------------
Expand All @@ -49,8 +50,10 @@ namespace vgui
CFFInputSlider *m_pBarWidth;
CFFInputSlider *m_pBarHeight;
CFFInputSlider *m_pBarBorderWidth;
CFFInputSlider *m_pBarMarginHorizontal;
CFFInputSlider *m_pBarMarginVertical;

CFFInputSlider *m_pItemMarginHorizontal;
CFFInputSlider *m_pItemMarginVertical;
CFFInputSlider *m_pItemColumns;

Label *m_pSizeLabel, *m_pTextLabel;
Label *m_pOffsetXLabel, *m_pOffsetYLabel, *m_pOffsetLabel;
Expand Down

0 comments on commit 6276598

Please sign in to comment.