Attachment #536847: patch_v1.0 for bug #659999

View | Details | Raw Unified | Return to bug 659999
Collapse All | Expand All

(-)a/gfx/src/nsThemeConstants.h (+12 lines)
Line     Link Here 
 Lines 94-109    Link Here 
94
#define NS_THEME_PROGRESSBAR_CHUNK                         52
94
#define NS_THEME_PROGRESSBAR_CHUNK                         52
95
// A vertical progress bar.
95
// A vertical progress bar.
96
#define NS_THEME_PROGRESSBAR_VERTICAL                      53
96
#define NS_THEME_PROGRESSBAR_VERTICAL                      53
97
// A vertical progress chunk
97
// A vertical progress chunk
98
#define NS_THEME_PROGRESSBAR_CHUNK_VERTICAL                54
98
#define NS_THEME_PROGRESSBAR_CHUNK_VERTICAL                54
99
// A horizontal meter bar.
100
#define NS_THEME_METERBAR                                  55
101
102
// The meter bar's meter indicator
103
#define NS_THEME_METERBAR_CHUNK                            56
104
105
// A vertical meter bar.
106
#define NS_THEME_METERBAR_VERTICAL                         57
107
108
// A vertical meter chunk
109
#define NS_THEME_METERBAR_CHUNK_VERTICAL                   58
110
99
// A single tab in a tab widget.
111
// A single tab in a tab widget.
100
#define NS_THEME_TAB                                       61
112
#define NS_THEME_TAB                                       61
101
// A single pane (inside the tabpanels container)
113
// A single pane (inside the tabpanels container)
102
#define NS_THEME_TAB_PANEL                                 62
114
#define NS_THEME_TAB_PANEL                                 62
103
// The tab panels container.
115
// The tab panels container.
104
#define NS_THEME_TAB_PANELS                                65
116
#define NS_THEME_TAB_PANELS                                65
(-)a/layout/style/forms.css (-6 / +2 lines)
Line     Link Here 
 Lines 685-703   progress { Link Here 
685
  height: 100%;
685
  height: 100%;
686
  width: 100%;
686
  width: 100%;
687
  /* Default style in case of there is -moz-appearance: none; */
687
  /* Default style in case of there is -moz-appearance: none; */
688
  background-color: #0064b4;
688
  background-color: #0064b4;
689
}
689
}
690
meter{
690
meter{
691
  /* Add a new moz-appearance : Bug 659999
691
  -moz-appearance: meterbar;
692
   * -moz-appearance: meterbar;
693
   */
694
  display: inline-block;
692
  display: inline-block;
695
  vertical-align: -0.2em;
693
  vertical-align: -0.2em;
696
  /* Default style in case of there is -moz-appearance: none; */
694
  /* Default style in case of there is -moz-appearance: none; */
697
  border: 2px solid;
695
  border: 2px solid;
698
  /* #e6e6e6 is a light gray. */
696
  /* #e6e6e6 is a light gray. */
699
  -moz-border-top-colors: ThreeDShadow #e6e6e6;
697
  -moz-border-top-colors: ThreeDShadow #e6e6e6;
700
  -moz-border-right-colors: ThreeDHighlight #e6e6e6;
698
  -moz-border-right-colors: ThreeDHighlight #e6e6e6;
 Lines 706-724   meter{ Link Here 
706
  background-color: #e6e6e6;
706
  background-color: #e6e6e6;
707
}
707
}
708
::-moz-meter-bar {
708
::-moz-meter-bar {
709
  display: inline-block ! important;
709
  display: inline-block ! important;
710
  float: none ! important;
710
  float: none ! important;
711
  position: static ! important;
711
  position: static ! important;
712
  overflow: visible ! important;
712
  overflow: visible ! important;
713
  /* Add a new moz-appearance : Bug 660232
713
  -moz-appearance: meterchunk;
714
    * -moz-appearance: meterchunk;
715
    */
716
  height: 100%;
714
  height: 100%;
717
  width: 100%;
715
  width: 100%;
718
  /* Default style in case of there is -moz-appearance: none;
716
  /* Default style in case of there is -moz-appearance: none;
719
   * #2eff46 is green
717
   * #2eff46 is green
720
   */
718
   */
721
  background-color: #2eff46;
719
  background-color: #2eff46;
(-)a/layout/style/nsCSSKeywordList.h (+5 lines)
Line     Link Here 
 Lines 328-343   CSS_KEY(lowercase, lowercase) Link Here 
328
CSS_KEY(ltr, ltr)
328
CSS_KEY(ltr, ltr)
329
CSS_KEY(manual, manual)
329
CSS_KEY(manual, manual)
330
CSS_KEY(margin-box, margin_box)
330
CSS_KEY(margin-box, margin_box)
331
CSS_KEY(matrix, matrix)
331
CSS_KEY(matrix, matrix)
332
CSS_KEY(medium, medium)
332
CSS_KEY(medium, medium)
333
CSS_KEY(menu, menu)
333
CSS_KEY(menu, menu)
334
CSS_KEY(menutext, menutext)
334
CSS_KEY(menutext, menutext)
335
CSS_KEY(message-box, message_box)
335
CSS_KEY(message-box, message_box)
336
CSS_KEY(meter, meter)
336
CSS_KEY(middle, middle)
337
CSS_KEY(middle, middle)
337
CSS_KEY(mix, mix)
338
CSS_KEY(mix, mix)
338
CSS_KEY(mm, mm)
339
CSS_KEY(mm, mm)
339
CSS_KEY(move, move)
340
CSS_KEY(move, move)
340
CSS_KEY(ms, ms)
341
CSS_KEY(ms, ms)
341
CSS_KEY(n-resize, n_resize)
342
CSS_KEY(n-resize, n_resize)
342
CSS_KEY(narrower, narrower)
343
CSS_KEY(narrower, narrower)
343
CSS_KEY(ne-resize, ne_resize)
344
CSS_KEY(ne-resize, ne_resize)
 Lines 546-561   CSS_KEY(menuradio, menuradio) Link Here 
546
CSS_KEY(menuseparator, menuseparator)
547
CSS_KEY(menuseparator, menuseparator)
547
CSS_KEY(menuarrow, menuarrow)
548
CSS_KEY(menuarrow, menuarrow)
548
CSS_KEY(menuimage, menuimage)
549
CSS_KEY(menuimage, menuimage)
549
CSS_KEY(menuitemtext, menuitemtext)
550
CSS_KEY(menuitemtext, menuitemtext)
550
CSS_KEY(menulist, menulist)
551
CSS_KEY(menulist, menulist)
551
CSS_KEY(menulist-button, menulistbutton)
552
CSS_KEY(menulist-button, menulistbutton)
552
CSS_KEY(menulist-text, menulisttext)
553
CSS_KEY(menulist-text, menulisttext)
553
CSS_KEY(menulist-textfield, menulisttextfield)
554
CSS_KEY(menulist-textfield, menulisttextfield)
555
CSS_KEY(meterbar, meterbar)
556
CSS_KEY(meterbar-vertical, meterbar_vertical)
557
CSS_KEY(meterchunk, meterchunk)
558
CSS_KEY(meterchunk-vertical, meterchunk_vertical)
554
CSS_KEY(scale-horizontal, scale_horizontal)
559
CSS_KEY(scale-horizontal, scale_horizontal)
555
CSS_KEY(scale-vertical, scale_vertical)
560
CSS_KEY(scale-vertical, scale_vertical)
556
CSS_KEY(scalethumb-horizontal, scalethumb_horizontal)
561
CSS_KEY(scalethumb-horizontal, scalethumb_horizontal)
557
CSS_KEY(scalethumb-vertical, scalethumb_vertical)
562
CSS_KEY(scalethumb-vertical, scalethumb_vertical)
558
CSS_KEY(scalethumbstart, scalethumbstart)
563
CSS_KEY(scalethumbstart, scalethumbstart)
559
CSS_KEY(scalethumbend, scalethumbend)
564
CSS_KEY(scalethumbend, scalethumbend)
560
CSS_KEY(scalethumbtick, scalethumbtick)
565
CSS_KEY(scalethumbtick, scalethumbtick)
561
CSS_KEY(groupbox, groupbox)
566
CSS_KEY(groupbox, groupbox)
(-)a/layout/style/nsCSSProps.cpp (+4 lines)
Line     Link Here 
 Lines 483-498   const PRInt32 nsCSSProps::kAppearanceKTa Link Here 
483
  eCSSKeyword_toolbarbutton,          NS_THEME_TOOLBAR_BUTTON,
483
  eCSSKeyword_toolbarbutton,          NS_THEME_TOOLBAR_BUTTON,
484
  eCSSKeyword_toolbargripper,         NS_THEME_TOOLBAR_GRIPPER,
484
  eCSSKeyword_toolbargripper,         NS_THEME_TOOLBAR_GRIPPER,
485
  eCSSKeyword_dualbutton,             NS_THEME_TOOLBAR_DUAL_BUTTON,
485
  eCSSKeyword_dualbutton,             NS_THEME_TOOLBAR_DUAL_BUTTON,
486
  eCSSKeyword_toolbarbutton_dropdown, NS_THEME_TOOLBAR_BUTTON_DROPDOWN,
486
  eCSSKeyword_toolbarbutton_dropdown, NS_THEME_TOOLBAR_BUTTON_DROPDOWN,
487
  eCSSKeyword_button_arrow_up,        NS_THEME_BUTTON_ARROW_UP,
487
  eCSSKeyword_button_arrow_up,        NS_THEME_BUTTON_ARROW_UP,
488
  eCSSKeyword_button_arrow_down,      NS_THEME_BUTTON_ARROW_DOWN,
488
  eCSSKeyword_button_arrow_down,      NS_THEME_BUTTON_ARROW_DOWN,
489
  eCSSKeyword_button_arrow_next,      NS_THEME_BUTTON_ARROW_NEXT,
489
  eCSSKeyword_button_arrow_next,      NS_THEME_BUTTON_ARROW_NEXT,
490
  eCSSKeyword_button_arrow_previous,  NS_THEME_BUTTON_ARROW_PREVIOUS,
490
  eCSSKeyword_button_arrow_previous,  NS_THEME_BUTTON_ARROW_PREVIOUS,
491
  eCSSKeyword_meterbar,               NS_THEME_METERBAR,
492
  eCSSKeyword_meterchunk,             NS_THEME_METERBAR_CHUNK,
493
  eCSSKeyword_meterbar_vertical,      NS_THEME_METERBAR_VERTICAL,
494
  eCSSKeyword_meterchunk_vertical,    NS_THEME_METERBAR_CHUNK_VERTICAL,
491
  eCSSKeyword_separator,              NS_THEME_TOOLBAR_SEPARATOR,
495
  eCSSKeyword_separator,              NS_THEME_TOOLBAR_SEPARATOR,
492
  eCSSKeyword_splitter,               NS_THEME_SPLITTER,
496
  eCSSKeyword_splitter,               NS_THEME_SPLITTER,
493
  eCSSKeyword_statusbar,              NS_THEME_STATUSBAR,
497
  eCSSKeyword_statusbar,              NS_THEME_STATUSBAR,
494
  eCSSKeyword_statusbarpanel,         NS_THEME_STATUSBAR_PANEL,
498
  eCSSKeyword_statusbarpanel,         NS_THEME_STATUSBAR_PANEL,
495
  eCSSKeyword_resizerpanel,           NS_THEME_STATUSBAR_RESIZER_PANEL,
499
  eCSSKeyword_resizerpanel,           NS_THEME_STATUSBAR_RESIZER_PANEL,
496
  eCSSKeyword_resizer,                NS_THEME_RESIZER,
500
  eCSSKeyword_resizer,                NS_THEME_RESIZER,
497
  eCSSKeyword_listbox,                NS_THEME_LISTBOX,
501
  eCSSKeyword_listbox,                NS_THEME_LISTBOX,
498
  eCSSKeyword_listitem,               NS_THEME_LISTBOX_LISTITEM,
502
  eCSSKeyword_listitem,               NS_THEME_LISTBOX_LISTITEM,
(-)a/widget/src/xpwidgets/nsNativeTheme.cpp (-1 / +2 lines)
Line     Link Here 
 Lines 467-484   nsNativeTheme::IsIndeterminateProgress(n Link Here 
467
    return aEventStates.HasState(NS_EVENT_STATE_INDETERMINATE);
468
    return aEventStates.HasState(NS_EVENT_STATE_INDETERMINATE);
468
  }
469
  }
469
  return aFrame->GetContent()->AttrValueIs(kNameSpaceID_None, nsWidgetAtoms::mode,
470
  return aFrame->GetContent()->AttrValueIs(kNameSpaceID_None, nsWidgetAtoms::mode,
470
                                           NS_LITERAL_STRING("undetermined"),
471
                                           NS_LITERAL_STRING("undetermined"),
471
                                           eCaseMatters);
472
                                           eCaseMatters);
472
}
473
}
474
// progressbar and meterbar:
473
PRBool
475
PRBool
474
nsNativeTheme::IsVerticalProgress(nsIFrame* aFrame)
476
nsNativeTheme::IsVerticalProgressMeter(nsIFrame* aFrame)
475
{
477
{
476
  return aFrame &&
478
  return aFrame &&
477
         aFrame->GetStyleDisplay()->mOrient == NS_STYLE_ORIENT_VERTICAL;
479
         aFrame->GetStyleDisplay()->mOrient == NS_STYLE_ORIENT_VERTICAL;
478
}
480
}
479
// menupopup:
481
// menupopup:
480
PRBool
482
PRBool
481
nsNativeTheme::IsSubmenu(nsIFrame* aFrame, PRBool* aLeftOfParent)
483
nsNativeTheme::IsSubmenu(nsIFrame* aFrame, PRBool* aLeftOfParent)
(-)a/widget/src/xpwidgets/nsNativeTheme.h (-2 / +2 lines)
Line     Link Here 
 Lines 154-173   class nsNativeTheme : public nsITimerCal Link Here 
154
  // tab:
154
  // tab:
155
  PRBool IsBottomTab(nsIFrame* aFrame);
155
  PRBool IsBottomTab(nsIFrame* aFrame);
156
  PRBool IsFirstTab(nsIFrame* aFrame);
156
  PRBool IsFirstTab(nsIFrame* aFrame);
157
  PRBool IsLastTab(nsIFrame* aFrame);
157
  PRBool IsLastTab(nsIFrame* aFrame);
158
  PRBool IsHorizontal(nsIFrame* aFrame);
158
  PRBool IsHorizontal(nsIFrame* aFrame);
159
  // progressbar:
159
  // progressbar and meterbar:
160
  PRBool IsIndeterminateProgress(nsIFrame* aFrame, nsEventStates aEventStates);
160
  PRBool IsIndeterminateProgress(nsIFrame* aFrame, nsEventStates aEventStates);
161
  PRBool IsVerticalProgress(nsIFrame* aFrame);
161
  PRBool IsVerticalProgressMeter(nsIFrame* aFrame);
162
  // textfield:
162
  // textfield:
163
  PRBool IsReadOnly(nsIFrame* aFrame) {
163
  PRBool IsReadOnly(nsIFrame* aFrame) {
164
      return CheckBooleanAttr(aFrame, nsWidgetAtoms::readonly);
164
      return CheckBooleanAttr(aFrame, nsWidgetAtoms::readonly);
165
  }
165
  }
166
  // menupopup:
166
  // menupopup:
167
  PRBool IsSubmenu(nsIFrame* aFrame, PRBool* aLeftOfParent);
167
  PRBool IsSubmenu(nsIFrame* aFrame, PRBool* aLeftOfParent);

Return to bug 659999