Commit: 8eab5d0459b5e22feaa506965ea6d45824535221 - main (git)

Commit MetaInfo

• Révision: 8eab5d0459b5e22feaa506965ea6d45824535221 (tree)
• l'heure: 2012-09-29 10:10:10
• Auteur: h2so5 <h2so5@git....>
• Commiter: h2so5

Message de Log

wigetsをpluginsに変更
Optionのラジオボタンのデザインを少し変更

Change Summary

• modified: client/CardManager.cpp
• modified: client/WindowManager.cpp
• delete: client/bin/system/images/gui/gui_icon_input.png
• delete: client/bin/system/images/gui/gui_icon_map.png
• modified: client/bin/system/images/gui/gui_option_selecting_bg.png
• add: client/bin/system/plugins/bgmlist/icon.png
• add: client/bin/system/plugins/inputbox/icon.png
• add: client/bin/system/plugins/modellist/icon.png
• add: client/bin/system/plugins/radar/icon.png
• add: client/bin/system/plugins/textchat/icon.png
• delete: client/bin/system/widgets/bgmlist/icon.png
• delete: client/bin/system/widgets/inputbox/icon.png
• delete: client/bin/system/widgets/modellist/icon.png
• delete: client/bin/system/widgets/radar/icon.png
• delete: client/bin/system/widgets/textchat/icon.png
• delete: client/bin/system/{widgets => plugins}/bgmlist/main.js
• delete: client/bin/system/{widgets => plugins}/inputbox/main.js
• delete: client/bin/system/{widgets => plugins}/modellist/main.js
• delete: client/bin/system/{widgets => plugins}/radar/main.js
• delete: client/bin/system/{widgets => plugins}/textchat/main.js
• modified: client/scene/Dashboard.cpp
• modified: client/scene/Init.cpp
• modified: client/scene/MainLoop.cpp
• modified: client/scene/Option.cpp

Modification

Binary files a/client/CardManager.cpp and b/client/CardManager.cpp differ

--- a/client/WindowManager.cpp
+++ b/client/WindowManager.cpp
@@ -101,7 +101,7 @@ void WindowManager::DrawButtons()
 
 void WindowManager::DrawIcons(const Rect& rect)
 {
-	int x = 32;
+	int x = 16;
 	auto card_manager = manager_accessor_->card_manager().lock();
 	BOOST_FOREACH(const auto& card, card_manager->cards()) {
 
@@ -116,32 +116,32 @@ void WindowManager::DrawIcons(const Rect& rect)
 			if (ptr->visible()) {
 				SetDrawBlendMode(DX_BLENDMODE_SUB, 40);
 			}
-			DrawGraph(rect.x + x, rect.y + 100 + 4, *image_handle, TRUE);
+			DrawGraph(rect.x + x, rect.y + 100 + 8, *image_handle, TRUE);
 			SetDrawBlendMode(DX_BLENDMODE_NOBLEND, 0);
 
-			x += 64;
+			x += 40;
 		}
 	}
 }
 
 void WindowManager::ProcessInputIcons(const Rect& rect, InputManager* input)
 {
-	int x = 32;
+	int x = 16;
 	auto card_manager = manager_accessor_->card_manager().lock();
 	BOOST_FOREACH(const auto& card, card_manager->cards()) {
 		if (auto ptr = card->GetWindow()) {
 
 			int icon_x = rect.x + x;
-			int icon_y = rect.y + 100 + 4;
+			int icon_y = rect.y + 100 + 8;
 
-			bool hover = (icon_x <= input->GetMouseX() && input->GetMouseX() <= icon_x + 48
-				&& icon_y <= input->GetMouseY() && input->GetMouseY() <= icon_y + 48);
+			bool hover = (icon_x <= input->GetMouseX() && input->GetMouseX() <= icon_x + 32
+				&& icon_y <= input->GetMouseY() && input->GetMouseY() <= icon_y + 32);
 
 			if (hover && input->GetMouseLeftCount() == 1) {
 				ptr->set_visible(!(ptr->visible()));
 				input->CancelMouseLeft();
 			}
-			x += 64;
+			x += 40;
 		}
 	}
 }

Binary files a/client/bin/system/images/gui/gui_icon_input.png and /dev/null differ

Binary files a/client/bin/system/images/gui/gui_icon_map.png and /dev/null differ

Binary files a/client/bin/system/images/gui/gui_option_selecting_bg.png and b/client/bin/system/images/gui/gui_option_selecting_bg.png differ

Binary files /dev/null and b/client/bin/system/plugins/bgmlist/icon.png differ

Binary files /dev/null and b/client/bin/system/plugins/inputbox/icon.png differ

Binary files /dev/null and b/client/bin/system/plugins/modellist/icon.png differ

Binary files /dev/null and b/client/bin/system/plugins/radar/icon.png differ

--- a/client/bin/system/widgets/radar/main.js
+++ b/client/bin/system/plugins/radar/main.js
@@ -5,7 +5,7 @@
 	"name": "レーダー",
 	"icon": "icon.png",
 	"api_version": 1,
-	"native": "rader"
+	"native": "radar"
 }
 
 ***MetaData***/
\ No newline at end of file

Binary files /dev/null and b/client/bin/system/plugins/textchat/icon.png differ

Binary files a/client/bin/system/widgets/bgmlist/icon.png and /dev/null differ

Binary files a/client/bin/system/widgets/inputbox/icon.png and /dev/null differ

Binary files a/client/bin/system/widgets/modellist/icon.png and /dev/null differ

Binary files a/client/bin/system/widgets/radar/icon.png and /dev/null differ

Binary files a/client/bin/system/widgets/textchat/icon.png and /dev/null differ

--- a/client/scene/Dashboard.cpp
+++ b/client/scene/Dashboard.cpp
@@ -74,7 +74,7 @@ void Dashboard::Update()
 	bg_alpha_ = std::min(150, bg_alpha_);
 	
     base_rect_.width = 800;
-    base_rect_.height = 160;
+    base_rect_.height = 148;
     base_rect_.x = (screen_width - base_rect_.width) / 2;
 
 	if (end_count_ > 0) {

Binary files a/client/scene/Init.cpp and b/client/scene/Init.cpp differ

--- a/client/scene/MainLoop.cpp
+++ b/client/scene/MainLoop.cpp
@@ -34,14 +34,10 @@ MainLoop::MainLoop(const ManagerAccessorPtr& manager_accessor) :
 
     inputbox_->ReloadTabs();
 	inputbox_->Activate();
-	inputbox_->set_icon_image_handle(
-		ResourceManager::LoadCachedGraph(_T("system/images/gui/gui_icon_input.png")));
 	card_manager_->AddNativeCard("inputbox", inputbox_);
 
 	minimap_->UIPlacement(config_manager_->screen_width() - MINIMAP_MINSIZE - 12, 12);
-	minimap_->set_icon_image_handle(
-		ResourceManager::LoadCachedGraph(_T("system/images/gui/gui_icon_map.png")));
-	card_manager_->AddNativeCard("rader", minimap_);
+	card_manager_->AddNativeCard("radar", minimap_);
 
 	window_manager_->RestorePosition();
 

--- a/client/scene/Option.cpp
+++ b/client/scene/Option.cpp
@@ -499,7 +499,7 @@ RadioButtonItem::RadioButtonItem(const tstring& name,
 		selecting_index_(0)
 {
     selecting_bg_image_handle_ = ResourceManager::LoadCachedDivGraph<3>(
-            _T("system/images/gui/gui_option_selecting_bg.png"), 3, 1, 16, 20);
+            _T("system/images/gui/gui_option_selecting_bg.png"), 3, 1, 16, 24);
 
 	ptree item_array;
 	read_json(std::stringstream(unicode::ToString(items)), item_array);
@@ -557,13 +557,13 @@ void RadioButtonItem::Draw()
 			SetDrawBlendMode(DX_BLENDMODE_SUB, 40);
 		}
 
-		DrawGraph(left - 8, base_rect_.y - 2, *selecting_bg_image_handle_[0], TRUE);
-		DrawRectExtendGraphF(left - 8 + 16, base_rect_.y - 2,
-								right - 16 + 8, base_rect_.y - 2 + 20,
-								0, 0, 1, 20, *selecting_bg_image_handle_[2], TRUE);
-		DrawGraph(right - 16 + 8, base_rect_.y - 2, *selecting_bg_image_handle_[2], TRUE);
+		DrawGraph(left - 8, base_rect_.y - 4, *selecting_bg_image_handle_[0], TRUE);
+		DrawRectExtendGraphF(left - 8 + 16, base_rect_.y - 4,
+								right - 16 + 8, base_rect_.y + 20,
+								0, 0, 1, 24, *selecting_bg_image_handle_[2], TRUE);
+		DrawGraph(right - 16 + 8, base_rect_.y - 4, *selecting_bg_image_handle_[2], TRUE);
 
-		SetDrawBlendMode(DX_BLENDMODE_NOBLEND, 0);
+		SetDrawBlendMode(DX_BLENDMODE_NOBLEND, 4);
 
 		DrawStringToHandle(left, base_rect_.y,
 			item.name.c_str(),