Fix a number of issues related to the media kioslave

2 files changed, 15 insertions, 8 deletions

diff --git a/kicker/kicker/buttons/kbutton.cpp b/kicker/kicker/buttons/kbutton.cpp
index 88b664059..6e934eb4f 100644
--- a/kicker/kicker/buttons/kbutton.cpp
+++ b/kicker/kicker/buttons/kbutton.cpp
@@ -56,8 +56,8 @@ KButton::KButton( TQWidget* parent )
         setButtonText(KickerSettings::kMenuText());
         setFont(KickerSettings::buttonFont());
         setTextColor(KickerSettings::buttonTextColor());
-        setMaximumHeight(30);
-        setMaximumWidth(widthForHeight(30));
+        setMaximumHeight(KickerSettings::maximumTDEMenuButtonHeight());
+        setMaximumWidth(widthForHeight(KickerSettings::maximumTDEMenuButtonHeight()));
         setCenterButtonInContainer(false);
     }
 }
@@ -70,7 +70,7 @@ KButton::~KButton()
 int KButton::widthForHeight(int height) const
 {
     if (KickerSettings::showKMenuText()) {
-        return PanelPopupButton::widthForHeight(30);
+        return PanelPopupButton::widthForHeight((height>KickerSettings::maximumTDEMenuButtonHeight())?KickerSettings::maximumTDEMenuButtonHeight():height);
     }
     else {
         return PanelPopupButton::widthForHeight(height);
@@ -80,7 +80,9 @@ int KButton::widthForHeight(int height) const
 int KButton::heightForWidth(int width) const
 {
     if (KickerSettings::showKMenuText()) {
-        return 30;
+        int recommendation = PanelPopupButton::heightForWidth(width);
+        if (recommendation > KickerSettings::maximumTDEMenuButtonHeight()) recommendation = KickerSettings::maximumTDEMenuButtonHeight();
+        return recommendation;
     }
     else {
         return PanelPopupButton::heightForWidth(width);
diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp
index fa3814bfb..a73d08abf 100644
--- a/kicker/kicker/core/container_button.cpp
+++ b/kicker/kicker/core/container_button.cpp
@@ -150,11 +150,16 @@ void ButtonContainer::embedButton(PanelButton* b)
     _button = b;
     _button->installEventFilter(this);
 
-    if (b->centerButtonInContainer()) {
-        TQVBoxLayout* vbox = new TQVBoxLayout(this);
-        vbox->addWidget(_button);
-        _layout = vbox;
+    TQVBoxLayout* vbox = new TQVBoxLayout(this);
+    if (!b->centerButtonInContainer()) {
+        b->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
     }
+    vbox->addWidget(_button, 1);
+    if (!b->centerButtonInContainer()) {
+        TQSpacerItem* spacer = new TQSpacerItem(0, 0, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
+        vbox->addItem(spacer);
+    }
+    _layout = vbox;
 
     connect(_button, TQT_SIGNAL(requestSave()), TQT_SIGNAL(requestSave()));
     connect(_button, TQT_SIGNAL(hideme(bool)), TQT_SLOT(hideRequested(bool)));