Skip to content

Y
YGOMobile
Commit a243d4d0 authored by fallenstardust's avatar fallenstardust
Browse files
Options

卡片信息取消tab选项卡

parent 7f5b217b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 41 deletions
Classes/gframe/event_handler.cpp
View file @ a243d4d0
...@@ -1882,7 +1882,7 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) { ...@@ -1882,7 +1882,7 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
case LISTBOX_LOG: { case LISTBOX_LOG: {
int sel = mainGame->lstLog->getSelected(); int sel = mainGame->lstLog->getSelected();
if(sel != -1 && (int)mainGame->logParam.size() >= sel && mainGame->logParam[sel] && is_selectable) { if(sel != -1 && (int)mainGame->logParam.size() >= sel && mainGame->logParam[sel] && is_selectable) {
mainGame->wInfos->setActiveTab(0); //mainGame->wInfos->setActiveTab(0);
} }
return true; return true;
break; break;
...@@ -2134,7 +2134,7 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) { ...@@ -2134,7 +2134,7 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
if(pos < 0) pos = 0; if(pos < 0) pos = 0;
if(pos > max) pos = max; if(pos > max) pos = max;
mainGame->scrCardText->setPos(pos); mainGame->scrCardText->setPos(pos);
mainGame->SetStaticText(mainGame->stText, mainGame->stText->getRelativePosition().getWidth() - 25, mainGame->guiFont, mainGame->showingtext, pos); mainGame->SetStaticText(mainGame->stText, mainGame->stText->getRelativePosition().getWidth() - 35, mainGame->guiFont, mainGame->showingtext, pos);
} }
if(is_dragging_lstLog) { if(is_dragging_lstLog) {
if(!mainGame->lstLog->getVerticalScrollBar()->isVisible()) { if(!mainGame->lstLog->getVerticalScrollBar()->isVisible()) {
......
Classes/gframe/game.cpp
View file @ a243d4d0
This diff is collapsed.
Classes/gframe/game.h
View file @ a243d4d0
...@@ -255,12 +255,16 @@ public: ...@@ -255,12 +255,16 @@ public:
//card image //card image
irr::gui::IGUIStaticText* wCardImg; irr::gui::IGUIStaticText* wCardImg;
irr::gui::IGUIImage* imgCard; irr::gui::IGUIImage* imgCard;
//bgm image
irr::gui::IGUIImage* imgVol;
irr::gui::IGUIImage* imgSettings;
irr::gui::IGUIImage* imgLog;
//hint text //hint text
irr::gui::IGUIStaticText* stHintMsg; irr::gui::IGUIStaticText* stHintMsg;
irr::gui::IGUIStaticText* stTip; irr::gui::IGUIStaticText* stTip;
irr::gui::IGUIStaticText* stCardListTip; irr::gui::IGUIStaticText* stCardListTip;
//infos //infos
irr::gui::IGUITabControl* wInfos; irr::gui::IGUIStaticText* wInfos;
irr::gui::IGUIStaticText* stName; irr::gui::IGUIStaticText* stName;
irr::gui::IGUIStaticText* stInfo; irr::gui::IGUIStaticText* stInfo;
irr::gui::IGUIStaticText* stDataInfo; irr::gui::IGUIStaticText* stDataInfo;
...@@ -270,6 +274,7 @@ public: ...@@ -270,6 +274,7 @@ public:
irr::gui::IGUIListBox* lstLog; irr::gui::IGUIListBox* lstLog;
irr::gui::IGUIButton* btnClearLog; irr::gui::IGUIButton* btnClearLog;
irr::gui::IGUIButton* btnSaveLog; irr::gui::IGUIButton* btnSaveLog;
irr::gui::IGUIWindow* wSettings;
irr::gui::IGUIWindow* tabHelper; irr::gui::IGUIWindow* tabHelper;
irr::gui::IGUIElement* elmTabHelperLast; irr::gui::IGUIElement* elmTabHelperLast;
irr::gui::IGUIScrollBar* scrTabHelper; irr::gui::IGUIScrollBar* scrTabHelper;
......
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