Compare commits
	
		
			4 Commits
		
	
	
		
			dev-35026d
			...
			dev-22e970
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 22e97063ec | |||
| 1ffee9933a | |||
| aaa23194c5 | |||
| 013d1fef3b | 
							
								
								
									
										2
									
								
								external/solanaceae_plugin
									
									
									
									
										vendored
									
									
								
							
							
								
								
								
								
								
							
						
						
									
										2
									
								
								external/solanaceae_plugin
									
									
									
									
										vendored
									
									
								
							 Submodule external/solanaceae_plugin updated: 82cfb6d492...f7a519754d
									
								
							@@ -89,6 +89,52 @@ static void drawIconCloud(
 | 
				
			|||||||
	ImGui::GetWindowDrawList()->AddPolyline(points.data(), points.size(), col_main, ImDrawFlags_None, 1.5f);
 | 
						ImGui::GetWindowDrawList()->AddPolyline(points.data(), points.size(), col_main, ImDrawFlags_None, 1.5f);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static void drawIconMailLines(
 | 
				
			||||||
 | 
						const ImVec2 p0,
 | 
				
			||||||
 | 
						const ImVec2 p1_o,
 | 
				
			||||||
 | 
						const ImU32 col,
 | 
				
			||||||
 | 
						const float thickness
 | 
				
			||||||
 | 
					) {
 | 
				
			||||||
 | 
					#define PLINE(x0, y0, x1, y1) \
 | 
				
			||||||
 | 
							ImGui::GetWindowDrawList()->AddLine( \
 | 
				
			||||||
 | 
								{p0.x + p1_o.x*(x0), p0.y + p1_o.y*(y0)}, \
 | 
				
			||||||
 | 
								{p0.x + p1_o.x*(x1), p0.y + p1_o.y*(y1)}, \
 | 
				
			||||||
 | 
								col, \
 | 
				
			||||||
 | 
								thickness \
 | 
				
			||||||
 | 
							);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							// quad
 | 
				
			||||||
 | 
							// (1,2) -> (1,8)
 | 
				
			||||||
 | 
							PLINE(0.1f, 0.2f, 0.1f, 0.8f)
 | 
				
			||||||
 | 
							// (1,8) -> (9,8)
 | 
				
			||||||
 | 
							PLINE(0.1f, 0.8f, 0.9f, 0.8f)
 | 
				
			||||||
 | 
							// (9,8) -> (9,2)
 | 
				
			||||||
 | 
							PLINE(0.9f, 0.8f, 0.9f, 0.2f)
 | 
				
			||||||
 | 
							// (9,2) -> (1,2)
 | 
				
			||||||
 | 
							PLINE(0.9f, 0.2f, 0.1f, 0.2f)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							// lip
 | 
				
			||||||
 | 
							// (1,2) -> (5,5)
 | 
				
			||||||
 | 
							PLINE(0.1f, 0.2f, 0.5f, 0.5f)
 | 
				
			||||||
 | 
							// (5,5) -> (9,2)
 | 
				
			||||||
 | 
							PLINE(0.5f, 0.5f, 0.9f, 0.2f)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#undef PLINE
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static void drawIconMail(
 | 
				
			||||||
 | 
						const ImVec2 p0,
 | 
				
			||||||
 | 
						const ImVec2 p1_o,
 | 
				
			||||||
 | 
						const ImU32 col_main,
 | 
				
			||||||
 | 
						const ImU32 col_back
 | 
				
			||||||
 | 
					) {
 | 
				
			||||||
 | 
						// dark background
 | 
				
			||||||
 | 
						// the circle looks bad in light mode
 | 
				
			||||||
 | 
						//ImGui::GetWindowDrawList()->AddCircleFilled({p0.x + p1_o.x*0.5f, p0.y + p1_o.y*0.5f}, p1_o.x*0.5f, col_back);
 | 
				
			||||||
 | 
						drawIconMailLines(p0, p1_o, col_back, 4.0f);
 | 
				
			||||||
 | 
						drawIconMailLines(p0, p1_o, col_main, 1.5f);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void renderAvatar(
 | 
					void renderAvatar(
 | 
				
			||||||
	const Theme& th,
 | 
						const Theme& th,
 | 
				
			||||||
	ContactTextureCache& contact_tc,
 | 
						ContactTextureCache& contact_tc,
 | 
				
			||||||
@@ -245,7 +291,26 @@ bool renderContactBig(
 | 
				
			|||||||
				ImGui::SameLine(0.f, same_line_spacing);
 | 
									ImGui::SameLine(0.f, same_line_spacing);
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			ImGui::Text("%s%s", unread?"* ":"", (c.all_of<Contact::Components::Name>() ? c.get<Contact::Components::Name>().name.c_str() : "<unk>"));
 | 
								//ImGui::Text("%s%s", unread?"* ":"", (c.all_of<Contact::Components::Name>() ? c.get<Contact::Components::Name>().name.c_str() : "<unk>"));
 | 
				
			||||||
 | 
								ImGui::TextUnformatted(c.all_of<Contact::Components::Name>() ? c.get<Contact::Components::Name>().name.c_str() : "<unk>");
 | 
				
			||||||
 | 
								if (unread) {
 | 
				
			||||||
 | 
									ImGui::SameLine();
 | 
				
			||||||
 | 
									const float icon_size { TEXT_BASE_HEIGHT - ImGui::GetStyle().FramePadding.y*2 };
 | 
				
			||||||
 | 
									ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - icon_size);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
									// icon pos
 | 
				
			||||||
 | 
									auto p0 = ImGui::GetCursorScreenPos();
 | 
				
			||||||
 | 
									//p0.y += ImGui::GetStyle().FramePadding.y;
 | 
				
			||||||
 | 
									ImVec2 p1_o = {icon_size, icon_size};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
									drawIconMail(
 | 
				
			||||||
 | 
										p0,
 | 
				
			||||||
 | 
										p1_o,
 | 
				
			||||||
 | 
										ImGui::GetColorU32(th.getColor<ThemeCol_Contact::unread>()),
 | 
				
			||||||
 | 
										ImGui::GetColorU32(th.getColor<ThemeCol_Contact::icon_backdrop>())
 | 
				
			||||||
 | 
									);
 | 
				
			||||||
 | 
									ImGui::Dummy(p1_o);
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		// line 2
 | 
							// line 2
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -14,6 +14,9 @@ enum class ThemeCol_Contact {
 | 
				
			|||||||
	avatar_online_cloud,
 | 
						avatar_online_cloud,
 | 
				
			||||||
	avatar_offline,
 | 
						avatar_offline,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						unread,
 | 
				
			||||||
 | 
						unread_muted,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	icon_backdrop,
 | 
						icon_backdrop,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -27,7 +30,7 @@ void renderAvatar(
 | 
				
			|||||||
// returns true if clicked, if selectable, will highlight on hover and respect selected
 | 
					// returns true if clicked, if selectable, will highlight on hover and respect selected
 | 
				
			||||||
// TODO: refine
 | 
					// TODO: refine
 | 
				
			||||||
// +------+
 | 
					// +------+
 | 
				
			||||||
// |	  | *Name (Alias?)
 | 
					// |	  | *Name (Alias?)            [v]
 | 
				
			||||||
// |Avatar| Satus Message <-- richpresence interface?
 | 
					// |Avatar| Satus Message <-- richpresence interface?
 | 
				
			||||||
// |	  | user status (online/away/busy)-direct/relayed / offline <-- last text?
 | 
					// |	  | user status (online/away/busy)-direct/relayed / offline <-- last text?
 | 
				
			||||||
// +------+
 | 
					// +------+
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -41,14 +41,17 @@ bool Theme::store(void) {
 | 
				
			|||||||
Theme getDefaultThemeDark(void) {
 | 
					Theme getDefaultThemeDark(void) {
 | 
				
			||||||
	Theme t;
 | 
						Theme t;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	t.setColor<ThemeCol_Contact::request_incoming			>({0.98f, 0.41f, 0.26f, 0.52f});
 | 
						t.setColor<ThemeCol_Contact::request_incoming		>({0.98f, 0.41f, 0.26f, 0.52f});
 | 
				
			||||||
	t.setColor<ThemeCol_Contact::request_outgoing			>({0.98f, 0.26f, 0.41f, 0.52f});
 | 
						t.setColor<ThemeCol_Contact::request_outgoing		>({0.98f, 0.26f, 0.41f, 0.52f});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	t.setColor<ThemeCol_Contact::avatar_online_direct	>({0.3f, 1.0f, 0.0f, 1.0f});
 | 
						t.setColor<ThemeCol_Contact::avatar_online_direct	>({0.3f, 1.0f, 0.0f, 1.0f});
 | 
				
			||||||
	t.setColor<ThemeCol_Contact::avatar_online_cloud	>({0.0f, 1.0f, 0.8f, 1.0f});
 | 
						t.setColor<ThemeCol_Contact::avatar_online_cloud	>({0.0f, 1.0f, 0.8f, 1.0f});
 | 
				
			||||||
	t.setColor<ThemeCol_Contact::avatar_offline		>({0.4f, 0.4f, 0.4f, 1.0f});
 | 
						t.setColor<ThemeCol_Contact::avatar_offline			>({0.4f, 0.4f, 0.4f, 1.0f});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	t.setColor<ThemeCol_Contact::icon_backdrop				>({0.0f, 0.0f, 0.0f, 0.4f});
 | 
						t.setColor<ThemeCol_Contact::unread					>(ImGui::GetStyleColorVec4(ImGuiCol_PlotHistogramHovered));
 | 
				
			||||||
 | 
						t.setColor<ThemeCol_Contact::unread_muted			>({0.6f, 0.6f, 0.6f, 0.9f});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						t.setColor<ThemeCol_Contact::icon_backdrop			>({0.0f, 0.0f, 0.0f, 0.4f});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return t;
 | 
						return t;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -73,15 +73,56 @@ MainScreen::MainScreen(SDL_Renderer* renderer_, Theme& theme_, std::string save_
 | 
				
			|||||||
		// TODO: pm?
 | 
							// TODO: pm?
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		// graphics
 | 
							// graphics
 | 
				
			||||||
		g_provideInstance("ImGuiContext", ImGui::GetVersion(), "host", ImGui::GetCurrentContext());
 | 
							g_provideInstance<ImGuiContext>("ImGuiContext", ImGui::GetVersion(), "host", ImGui::GetCurrentContext());
 | 
				
			||||||
 | 
							{
 | 
				
			||||||
 | 
								ImGuiMemAllocFunc alloc_func = nullptr;
 | 
				
			||||||
 | 
								ImGuiMemFreeFunc free_func = nullptr;
 | 
				
			||||||
 | 
								void* user_data = nullptr;
 | 
				
			||||||
 | 
								ImGui::GetAllocatorFunctions(&alloc_func, &free_func, &user_data);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
								// function pointers are funky
 | 
				
			||||||
 | 
								g_provideInstance("ImGuiMemAllocFunc", ImGui::GetVersion(), "host", reinterpret_cast<void*>(alloc_func));
 | 
				
			||||||
 | 
								g_provideInstance("ImGuiMemFreeFunc", ImGui::GetVersion(), "host", reinterpret_cast<void*>(free_func));
 | 
				
			||||||
 | 
								if (user_data != nullptr) { // dont register nullptrs (can be valid, we rely on the other 2 pointers to indicate)
 | 
				
			||||||
 | 
									g_provideInstance("ImGuiMemUserData", ImGui::GetVersion(), "host", user_data);
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		g_provideInstance<TextureUploaderI>("TextureUploaderI", "host", &sdlrtu);
 | 
							g_provideInstance<TextureUploaderI>("TextureUploaderI", "host", &sdlrtu);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	for (const auto& ppath : plugins) {
 | 
						for (const auto& ppath : plugins) {
 | 
				
			||||||
		if (!pm.add(ppath)) {
 | 
							if (!pm.add(ppath)) {
 | 
				
			||||||
			std::cerr << "MS error: loading plugin '" << ppath << "' failed!\n";
 | 
								std::cerr << "MS error: loading plugin '" << ppath << "' failed!\n";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			// thow?
 | 
								// thow?
 | 
				
			||||||
			assert(false && "failed to load plugin");
 | 
								//assert(false && "failed to load plugin");
 | 
				
			||||||
 | 
								SDL_MessageBoxData mb;
 | 
				
			||||||
 | 
								mb.flags = SDL_MESSAGEBOX_ERROR;
 | 
				
			||||||
 | 
								mb.window = nullptr;
 | 
				
			||||||
 | 
								mb.title = "Tomato failed to load a plugin!";
 | 
				
			||||||
 | 
								std::string message {"Failed to load plugin '"};
 | 
				
			||||||
 | 
								message += ppath;
 | 
				
			||||||
 | 
								message += "' !";
 | 
				
			||||||
 | 
								mb.message = message.c_str();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
								mb.numbuttons = 2;
 | 
				
			||||||
 | 
								SDL_MessageBoxButtonData mb_buttons[2] {};
 | 
				
			||||||
 | 
								mb_buttons[0].buttonID = 1;
 | 
				
			||||||
 | 
								mb_buttons[0].flags = SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT;
 | 
				
			||||||
 | 
								mb_buttons[0].text = "Abort";
 | 
				
			||||||
 | 
								mb_buttons[1].buttonID = 2;
 | 
				
			||||||
 | 
								mb_buttons[1].flags = SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT;
 | 
				
			||||||
 | 
								mb_buttons[1].text = "Continue Anyway";
 | 
				
			||||||
 | 
								mb.buttons = mb_buttons;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
								mb.colorScheme = nullptr;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
								int button_id = 0;
 | 
				
			||||||
 | 
								SDL_ShowMessageBox(&mb, &button_id);
 | 
				
			||||||
 | 
								if (button_id == 1) {
 | 
				
			||||||
 | 
									exit(1);
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user