Commit f6f07e0c authored by Zhiyi Zhang's avatar Zhiyi Zhang Committed by Alexandre Julliard

uxtheme: Support parsing more toolbar parts and states.

parent c9af75ca
...@@ -1103,6 +1103,8 @@ static const MSSTYLES_CLASS_MAP classToolbar[] = { ...@@ -1103,6 +1103,8 @@ static const MSSTYLES_CLASS_MAP classToolbar[] = {
{TP_BUTTON, TS_DISABLED, L"DISABLED"}, {TP_BUTTON, TS_DISABLED, L"DISABLED"},
{TP_BUTTON, TS_CHECKED, L"CHECKED"}, {TP_BUTTON, TS_CHECKED, L"CHECKED"},
{TP_BUTTON, TS_HOTCHECKED, L"HOTCHECKED"}, {TP_BUTTON, TS_HOTCHECKED, L"HOTCHECKED"},
{TP_BUTTON, TS_NEARHOT, L"NEARHOT"},
{TP_BUTTON, TS_OTHERSIDEHOT, L"OTHERSIDEHOT"},
{TP_DROPDOWNBUTTON, 0, L"DROPDOWNBUTTON"}, {TP_DROPDOWNBUTTON, 0, L"DROPDOWNBUTTON"},
{TP_DROPDOWNBUTTON, TS_NORMAL, L"NORMAL"}, {TP_DROPDOWNBUTTON, TS_NORMAL, L"NORMAL"},
{TP_DROPDOWNBUTTON, TS_HOT, L"HOT"}, {TP_DROPDOWNBUTTON, TS_HOT, L"HOT"},
...@@ -1110,6 +1112,8 @@ static const MSSTYLES_CLASS_MAP classToolbar[] = { ...@@ -1110,6 +1112,8 @@ static const MSSTYLES_CLASS_MAP classToolbar[] = {
{TP_DROPDOWNBUTTON, TS_DISABLED, L"DISABLED"}, {TP_DROPDOWNBUTTON, TS_DISABLED, L"DISABLED"},
{TP_DROPDOWNBUTTON, TS_CHECKED, L"CHECKED"}, {TP_DROPDOWNBUTTON, TS_CHECKED, L"CHECKED"},
{TP_DROPDOWNBUTTON, TS_HOTCHECKED, L"HOTCHECKED"}, {TP_DROPDOWNBUTTON, TS_HOTCHECKED, L"HOTCHECKED"},
{TP_DROPDOWNBUTTON, TS_NEARHOT, L"NEARHOT"},
{TP_DROPDOWNBUTTON, TS_OTHERSIDEHOT, L"OTHERSIDEHOT"},
{TP_SPLITBUTTON, 0, L"SPLITBUTTON"}, {TP_SPLITBUTTON, 0, L"SPLITBUTTON"},
{TP_SPLITBUTTON, TS_NORMAL, L"NORMAL"}, {TP_SPLITBUTTON, TS_NORMAL, L"NORMAL"},
{TP_SPLITBUTTON, TS_HOT, L"HOT"}, {TP_SPLITBUTTON, TS_HOT, L"HOT"},
...@@ -1117,6 +1121,8 @@ static const MSSTYLES_CLASS_MAP classToolbar[] = { ...@@ -1117,6 +1121,8 @@ static const MSSTYLES_CLASS_MAP classToolbar[] = {
{TP_SPLITBUTTON, TS_DISABLED, L"DISABLED"}, {TP_SPLITBUTTON, TS_DISABLED, L"DISABLED"},
{TP_SPLITBUTTON, TS_CHECKED, L"CHECKED"}, {TP_SPLITBUTTON, TS_CHECKED, L"CHECKED"},
{TP_SPLITBUTTON, TS_HOTCHECKED, L"HOTCHECKED"}, {TP_SPLITBUTTON, TS_HOTCHECKED, L"HOTCHECKED"},
{TP_SPLITBUTTON, TS_NEARHOT, L"NEARHOT"},
{TP_SPLITBUTTON, TS_OTHERSIDEHOT, L"OTHERSIDEHOT"},
{TP_SPLITBUTTONDROPDOWN, 0, L"SPLITBUTTONDROPDOWN"}, {TP_SPLITBUTTONDROPDOWN, 0, L"SPLITBUTTONDROPDOWN"},
{TP_SPLITBUTTONDROPDOWN, TS_NORMAL, L"NORMAL"}, {TP_SPLITBUTTONDROPDOWN, TS_NORMAL, L"NORMAL"},
{TP_SPLITBUTTONDROPDOWN, TS_HOT, L"HOT"}, {TP_SPLITBUTTONDROPDOWN, TS_HOT, L"HOT"},
...@@ -1124,6 +1130,8 @@ static const MSSTYLES_CLASS_MAP classToolbar[] = { ...@@ -1124,6 +1130,8 @@ static const MSSTYLES_CLASS_MAP classToolbar[] = {
{TP_SPLITBUTTONDROPDOWN, TS_DISABLED, L"DISABLED"}, {TP_SPLITBUTTONDROPDOWN, TS_DISABLED, L"DISABLED"},
{TP_SPLITBUTTONDROPDOWN, TS_CHECKED, L"CHECKED"}, {TP_SPLITBUTTONDROPDOWN, TS_CHECKED, L"CHECKED"},
{TP_SPLITBUTTONDROPDOWN, TS_HOTCHECKED, L"HOTCHECKED"}, {TP_SPLITBUTTONDROPDOWN, TS_HOTCHECKED, L"HOTCHECKED"},
{TP_SPLITBUTTONDROPDOWN, TS_NEARHOT, L"NEARHOT"},
{TP_SPLITBUTTONDROPDOWN, TS_OTHERSIDEHOT, L"OTHERSIDEHOT"},
{TP_SEPARATOR, 0, L"SEPARATOR"}, {TP_SEPARATOR, 0, L"SEPARATOR"},
{TP_SEPARATOR, TS_NORMAL, L"NORMAL"}, {TP_SEPARATOR, TS_NORMAL, L"NORMAL"},
{TP_SEPARATOR, TS_HOT, L"HOT"}, {TP_SEPARATOR, TS_HOT, L"HOT"},
...@@ -1131,6 +1139,8 @@ static const MSSTYLES_CLASS_MAP classToolbar[] = { ...@@ -1131,6 +1139,8 @@ static const MSSTYLES_CLASS_MAP classToolbar[] = {
{TP_SEPARATOR, TS_DISABLED, L"DISABLED"}, {TP_SEPARATOR, TS_DISABLED, L"DISABLED"},
{TP_SEPARATOR, TS_CHECKED, L"CHECKED"}, {TP_SEPARATOR, TS_CHECKED, L"CHECKED"},
{TP_SEPARATOR, TS_HOTCHECKED, L"HOTCHECKED"}, {TP_SEPARATOR, TS_HOTCHECKED, L"HOTCHECKED"},
{TP_SEPARATOR, TS_NEARHOT, L"NEARHOT"},
{TP_SEPARATOR, TS_OTHERSIDEHOT, L"OTHERSIDEHOT"},
{TP_SEPARATORVERT, 0, L"SEPARATORVERT"}, {TP_SEPARATORVERT, 0, L"SEPARATORVERT"},
{TP_SEPARATORVERT, TS_NORMAL, L"NORMAL"}, {TP_SEPARATORVERT, TS_NORMAL, L"NORMAL"},
{TP_SEPARATORVERT, TS_HOT, L"HOT"}, {TP_SEPARATORVERT, TS_HOT, L"HOT"},
...@@ -1138,6 +1148,17 @@ static const MSSTYLES_CLASS_MAP classToolbar[] = { ...@@ -1138,6 +1148,17 @@ static const MSSTYLES_CLASS_MAP classToolbar[] = {
{TP_SEPARATORVERT, TS_DISABLED, L"DISABLED"}, {TP_SEPARATORVERT, TS_DISABLED, L"DISABLED"},
{TP_SEPARATORVERT, TS_CHECKED, L"CHECKED"}, {TP_SEPARATORVERT, TS_CHECKED, L"CHECKED"},
{TP_SEPARATORVERT, TS_HOTCHECKED, L"HOTCHECKED"}, {TP_SEPARATORVERT, TS_HOTCHECKED, L"HOTCHECKED"},
{TP_SEPARATORVERT, TS_NEARHOT, L"NEARHOT"},
{TP_SEPARATORVERT, TS_OTHERSIDEHOT, L"OTHERSIDEHOT"},
{TP_DROPDOWNBUTTONGLYPH, 0, L"DROPDOWNBUTTONGLYPH"},
{TP_DROPDOWNBUTTONGLYPH, TS_NORMAL, L"NORMAL"},
{TP_DROPDOWNBUTTONGLYPH, TS_HOT, L"HOT"},
{TP_DROPDOWNBUTTONGLYPH, TS_PRESSED, L"PRESSED"},
{TP_DROPDOWNBUTTONGLYPH, TS_DISABLED, L"DISABLED"},
{TP_DROPDOWNBUTTONGLYPH, TS_CHECKED, L"CHECKED"},
{TP_DROPDOWNBUTTONGLYPH, TS_HOTCHECKED, L"HOTCHECKED"},
{TP_DROPDOWNBUTTONGLYPH, TS_NEARHOT, L"NEARHOT"},
{TP_DROPDOWNBUTTONGLYPH, TS_OTHERSIDEHOT, L"OTHERSIDEHOT"},
{0, 0, L""} {0, 0, L""}
}; };
......
...@@ -1344,6 +1344,7 @@ enum TOOLBARPARTS { ...@@ -1344,6 +1344,7 @@ enum TOOLBARPARTS {
TP_SPLITBUTTONDROPDOWN = 4, TP_SPLITBUTTONDROPDOWN = 4,
TP_SEPARATOR = 5, TP_SEPARATOR = 5,
TP_SEPARATORVERT = 6, TP_SEPARATORVERT = 6,
TP_DROPDOWNBUTTONGLYPH = 7,
}; };
#define TOOLBARSTYLEPARTS TOOLBARPARTS; #define TOOLBARSTYLEPARTS TOOLBARPARTS;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment