Skip to content

Fold TipLangBarToggleButton into TipLangBarButton #1614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yukawa wants to merge 1 commit into
base: master
Choose a base branch
from
+73 −281
Open

Fold TipLangBarToggleButton into TipLangBarButton #1614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/win32/tip/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,8 +391,6 @@ mozc_cc_library(
"//base/win32:com_implements",
"//bazel/win32:user32",
"//win32/base:tsf_profile",
"@com_google_absl//absl/base",
"@com_google_absl//absl/base:core_headers",
"@com_microsoft_wil//:wil",
],
)
Expand Down
7 changes: 1 addition & 6 deletions src/win32/tip/tip_lang_bar.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
#include "win32/tip/tip_lang_bar.h"

#include <ctfutb.h>
#include <guiddef.h>
#include <wil/com.h>
#include <windows.h>

Expand All @@ -51,8 +50,6 @@ namespace win32 {
namespace tsf {
namespace {

constexpr bool kShowInTaskbar = true;

TipLangBarCallback::ItemId GetItemId(DWORD composition_mode) {
switch (composition_mode) {
case commands::DIRECT:
Expand Down Expand Up @@ -125,9 +122,7 @@ HRESULT TipLangBar::InitLangBar(TipLangBarCallback* text_service) {
{kTipLangBarItemTypeDefault, TipLangBarCallback::kHelp, IDS_HELP, 0},
};

constexpr bool kNonMenuButton = false;
auto input_mode_menu = MakeComPtr<TipLangBarToggleButton>(
text_service, GUID_LBI_INPUTMODE, kNonMenuButton, kShowInTaskbar);
auto input_mode_menu = MakeComPtr<TipLangBarButton>(text_service);
if (input_mode_menu == nullptr) {
return E_OUTOFMEMORY;
}
Expand Down
2 changes: 1 addition & 1 deletion src/win32/tip/tip_lang_bar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class TipLangBar {

// Represents the input mode button, which is shown in the taskbar as the IME
// mode icon on Windows 8 and later.
wil::com_ptr_nothrow<TipLangBarToggleButton> input_mode_button_for_win8_;
wil::com_ptr_nothrow<TipLangBarButton> input_mode_button_for_win8_;
};

} // namespace tsf
Expand Down
Loading
Loading