equal
deleted
inserted
replaced
4092 } |
4092 } |
4093 |
4093 |
4094 if (pe1 != PseudoElement_None) { |
4094 if (pe1 != PseudoElement_None) { |
4095 QRenderRule subRule = renderRule(w, opt, pe1); |
4095 QRenderRule subRule = renderRule(w, opt, pe1); |
4096 if (subRule.bg != 0 || subRule.hasDrawable()) { |
4096 if (subRule.bg != 0 || subRule.hasDrawable()) { |
4097 //We test subRule.bg dirrectly because hasBackground() would return false for background:none. |
4097 //We test subRule.bg directly because hasBackground() would return false for background:none. |
4098 //But we still don't want the default drawning in that case (example for QScrollBar::add-page) (task 198926) |
4098 //But we still don't want the default drawning in that case (example for QScrollBar::add-page) (task 198926) |
4099 subRule.drawRule(p, opt->rect); |
4099 subRule.drawRule(p, opt->rect); |
4100 } else if (fallback) { |
4100 } else if (fallback) { |
4101 QWindowsStyle::drawControl(ce, opt, p, w); |
4101 QWindowsStyle::drawControl(ce, opt, p, w); |
4102 pe2 = PseudoElement_None; |
4102 pe2 = PseudoElement_None; |
4280 if(rule.hasDrawable()) { |
4280 if(rule.hasDrawable()) { |
4281 rule.drawRule(p, opt->rect); |
4281 rule.drawRule(p, opt->rect); |
4282 return; |
4282 return; |
4283 } |
4283 } |
4284 break; |
4284 break; |
|
4285 |
|
4286 case PE_FrameMenu: |
|
4287 if (rule.hasDrawable()) { |
|
4288 // Drawn by PE_PanelMenu |
|
4289 return; |
|
4290 } |
|
4291 break; |
4285 |
4292 |
4286 case PE_PanelMenuBar: |
4293 case PE_PanelMenuBar: |
4287 if (rule.hasDrawable()) { |
4294 if (rule.hasDrawable()) { |
4288 // Drawn by PE_Widget |
4295 // Drawn by PE_Widget |
4289 return; |
4296 return; |