summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2022-10-17 19:21:33 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2022-10-18 10:10:46 +0900
commit5d0bb575139722b32c79f5a3cc3e00f032c40303 (patch)
tree462926d6319400ee7deb5dd41bc7bdbf76db04d5
parent1e75fe932049b9aab722358c8a185cc7fc0251ce (diff)
downloadtwin-style-machbunt-r14.0.x.tar.gz
twin-style-machbunt-r14.0.x.zip
Fixed button related SEGV.r14.0.13r14.0.x
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit d46e0e623af5fad1b1bd7ce34cd9711593ca2973)
-rw-r--r--src/MachBunt.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/MachBunt.cpp b/src/MachBunt.cpp
index 6c00f57..ef3cee5 100644
--- a/src/MachBunt.cpp
+++ b/src/MachBunt.cpp
@@ -259,8 +259,8 @@ void MachBunt::createButtons()
{
if ( !button[BtnMenu] )
button[BtnMenu] = new MachBuntButton(this, "menu", BtnMenu, text_img[0][smallButtons], text_img[1][smallButtons], smallButtons, i18n("Menu"));
-// if ( !button[BtnSticky] )
-// button[BtnSticky] = new MachBuntButton(this, "sticky", BtnSticky, middle_img[0][smallButtons], middle_img[1][smallButtons], smallButtons, i18n("Sticky"));
+ //if ( !button[BtnSticky] )
+ // button[BtnSticky] = new MachBuntButton(this, "sticky", BtnSticky, middle_img[0][smallButtons], middle_img[1][smallButtons], smallButtons, i18n("Sticky"));
if ( !button[BtnHelp] )
button[BtnHelp]= new MachBuntButton(this, "help", BtnHelp, middle_img[0][smallButtons], middle_img[1][smallButtons], smallButtons, i18n("Help"));
if ( !button[BtnIconify] )
@@ -314,9 +314,9 @@ int MachBunt::mapButton( const TQChar &c)
switch (c.latin1())
{
case 'M':
- return BtnMenu;
- case 'S':
- return BtnSticky;
+ return BtnMenu;
+ //case 'S':
+ // return BtnSticky;
case 'H': // Help
return BtnHelp;
case 'I': // Minimize
@@ -336,21 +336,21 @@ void MachBunt::doLayout()
delete windowLayout;
windowLayout = new TQVBoxLayout(widget(), 0, 0);
- titlebar = new TQSpacerItem ( 0, titleHeight, TQSizePolicy::Expanding,
- TQSizePolicy::Fixed);
+ titlebar = new TQSpacerItem ( 0, titleHeight, TQSizePolicy::Expanding, TQSizePolicy::Fixed);
TQBoxLayout *topLayout = new TQBoxLayout(windowLayout, TQBoxLayout::LeftToRight, 0, 0);
TQString leftButtons(options()->customButtonPositions() ? options()->titleButtonsLeft() : "M");
TQString rightButtons(options()->customButtonPositions() ? options()->titleButtonsRight() : "HIAX");
bool first_left = true;
- for ( unsigned int i = 0; i <options()->titleButtonsLeft().length(); i++)
+ for ( unsigned int i = 0; i < leftButtons.length(); i++)
{
int b = mapButton(leftButtons[i]);
- if ( b>=0 ){
+ if (b >= 0)
+ {
topLayout->addWidget(button[b], TQt::AlignVCenter);
- topLayout->setStretchFactor(button[b], 0);
- button[b]->setFixedSize(titleHeight, titleHeight);
+ topLayout->setStretchFactor(button[b], 0);
+ button[b]->setFixedSize(titleHeight, titleHeight);
if( first_left )
{
first_left = false;
@@ -362,7 +362,7 @@ void MachBunt::doLayout()
topLayout->addItem(titlebar);
MachBuntButton* last_right = NULL;
- for ( unsigned int i = 0; i <options()->titleButtonsRight().length(); i++)
+ for ( unsigned int i = 0; i < rightButtons.length(); i++)
{
int b = mapButton(rightButtons[i]);
if ( b>=0 ){
@@ -378,7 +378,7 @@ void MachBunt::doLayout()
TQHBoxLayout * midLayout = new TQHBoxLayout(windowLayout, 0, 0);
midLayout->addSpacing(BORDER_LEFT);
if( isPreview())
- midLayout->addWidget(new TQLabel( i18n( "<center><b>MachBunt</b></center>" ), widget()));
+ midLayout->addWidget(new TQLabel( i18n( "<center><b>MachBunt</b></center>" ), widget()));
else
midLayout->addItem( new TQSpacerItem( 0, 0 )); // no widget in the middle
midLayout->addSpacing(BORDER_RIGHT);