Browse Source

Small theme tweaks

tags/1.9.6
falkTX 10 years ago
parent
commit
b32890072c
2 changed files with 7 additions and 7 deletions
  1. +2
    -0
      source/bridges-plugin/CarlaBridgePlugin.cpp
  2. +5
    -7
      source/theme/CarlaStyle.cpp

+ 2
- 0
source/bridges-plugin/CarlaBridgePlugin.cpp View File

@@ -296,6 +296,7 @@ int main(int argc, char* argv[])
return 1; return 1;
} }


#if defined(CARLA_OS_WIN) && ! defined(BUILDING_CARLA_FOR_WINDOWS)
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// Test if bridge is working // Test if bridge is working


@@ -304,6 +305,7 @@ int main(int argc, char* argv[])
carla_stderr("A JACK or Wine library is missing, cannot continue"); carla_stderr("A JACK or Wine library is missing, cannot continue");
return 1; return 1;
} }
#endif


// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// Get args // Get args


+ 5
- 7
source/theme/CarlaStyle.cpp View File

@@ -1875,6 +1875,8 @@ void CarlaStyle::drawControl(ControlElement element, const QStyleOption *option,
if (checked) if (checked)
box.state |= State_On; box.state |= State_On;
proxy()->drawPrimitive(PE_IndicatorCheckBox, &box, painter, widget); proxy()->drawPrimitive(PE_IndicatorCheckBox, &box, painter, widget);
painter->setPen(QPen(highlight, 0));
painter->drawRect(checkRect);
} }
} }
} }
@@ -3748,7 +3750,6 @@ int CarlaStyle::styleHint(StyleHint hint, const QStyleOption* option, const QWid
case SH_ComboBox_ListMouseTracking: case SH_ComboBox_ListMouseTracking:
case SH_ScrollBar_StopMouseOverSlider: case SH_ScrollBar_StopMouseOverSlider:
case SH_ScrollBar_MiddleClickAbsolutePosition: case SH_ScrollBar_MiddleClickAbsolutePosition:
case SH_EtchDisabledText:
case SH_TitleBar_AutoRaise: case SH_TitleBar_AutoRaise:
case SH_TitleBar_NoBorder: case SH_TitleBar_NoBorder:
case SH_ItemView_ShowDecorationSelected: case SH_ItemView_ShowDecorationSelected:
@@ -3758,20 +3759,17 @@ int CarlaStyle::styleHint(StyleHint hint, const QStyleOption* option, const QWid
case SH_Menu_MouseTracking: case SH_Menu_MouseTracking:
return 1; return 1;


case SH_ComboBox_Popup:
case SH_EtchDisabledText:
case SH_ToolBox_SelectedPageTitleBold: case SH_ToolBox_SelectedPageTitleBold:
case SH_ScrollView_FrameOnlyAroundContents: case SH_ScrollView_FrameOnlyAroundContents:
case SH_Menu_AllowActiveAndDisabled: case SH_Menu_AllowActiveAndDisabled:
case SH_MainWindow_SpaceBelowMenuBar: case SH_MainWindow_SpaceBelowMenuBar:
case SH_DialogButtonBox_ButtonsHaveIcons:
//case SH_DialogButtonBox_ButtonsHaveIcons:
case SH_MessageBox_CenterButtons: case SH_MessageBox_CenterButtons:
case SH_RubberBand_Mask: case SH_RubberBand_Mask:
return 0; return 0;


case SH_ComboBox_Popup:
if (const QStyleOptionComboBox *cmb = qstyleoption_cast<const QStyleOptionComboBox*>(option))
return !cmb->editable;
return 0;

case SH_Table_GridLineColor: case SH_Table_GridLineColor:
return option ? option->palette.background().color().darker(120).rgb() : 0; return option ? option->palette.background().color().darker(120).rgb() : 0;




Loading…
Cancel
Save