Ignore:
Timestamp:
May 3, 2016, 5:25:45 PM (9 years ago)
Author:
Silvan Scherrer
Message:

smplayer: update trunk to version 16.4

Location:
smplayer/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • smplayer/trunk

  • smplayer/trunk/src/mpcgui/mpcgui.cpp

    r170 r176  
    5252        if (pref->compact_mode) {
    5353                controlwidget->hide();
    54         timeslidewidget->hide();
    55         }
     54                timeslidewidget->hide();
     55        }
     56
     57        applyStyles();
    5658}
    5759
     
    194196        floating_control->setActivationArea( (AutohideWidget::Activation) pref->floating_activation_area);
    195197        floating_control->setHideDelay(pref->floating_hide_delay);
    196         QTimer::singleShot(500, floating_control, SLOT(activate()));
     198        QTimer::singleShot(100, floating_control, SLOT(activate()));
    197199
    198200
  • smplayer/trunk/src/mpcgui/mpcgui.h

    r170 r176  
    1717*/
    1818
    19 #ifndef _MPC_GUI_H_
    20 #define _MPC_GUI_H_
     19#ifndef MPC_GUI_H
     20#define MPC_GUI_H
    2121
    2222#include "baseguiplus.h"
  • smplayer/trunk/src/mpcgui/mpcstyles.h

    r113 r176  
    1717*/
    1818
    19 #ifndef _MPC_STYLES_H_
    20 #define _MPC_STYLES_H_
     19#ifndef MPC_STYLES_H
     20#define MPC_STYLES_H
    2121
    2222#include <QWindowsStyle>
Note: See TracChangeset for help on using the changeset viewer.