table adjustments (still not appearing) and button text fixes

crates/core/src/style/table_row.rs

@@ -40,7 +40,7 @@ impl StyleSheet for Theme {
 	fn appearance(&self, style: &Self::Style) -> Appearance {
 		match style {
 			TableRowStyle::Default => Appearance {
-				text_color: Some(self.palette.normal.primary),
+				text_color: Some(self.palette.bright.primary),
 				background: Some(Background::Color(self.palette.normal.primary)),
 				border_radius: 0.0,
 				border_width: 0.0,
@@ -51,14 +51,15 @@ impl StyleSheet for Theme {
 				offset_right: 0.0,
 			},
 			TableRowStyle::TableRowAlternate => Appearance {
+				text_color: Some(self.palette.bright.primary),
 				background: Some(Background::Color(Color {
 					a: 0.50,
 					..self.palette.normal.primary
 				})),
 				..Appearance::default()
 			},
 			TableRowStyle::TableRowHighlife => Appearance {
-				text_color: Some(self.palette.normal.primary),
+				text_color: Some(self.palette.bright.primary),
 				background: Some(Background::Color(Color {
 					a: 0.30,
 					..self.palette.normal.primary
@@ -70,7 +71,7 @@ impl StyleSheet for Theme {
 				offset_right: 0.0,
 			},
 			TableRowStyle::TableRowLowlife => Appearance {
-				text_color: Some(self.palette.normal.primary),
+				text_color: Some(self.palette.bright.primary),
 				background: Some(Background::Color(Color::TRANSPARENT)),
 				border_radius: 0.0,
 				border_width: 0.0,
@@ -79,7 +80,7 @@ impl StyleSheet for Theme {
 				offset_right: 0.0,
 			},
 			TableRowStyle::TableRowSelected => Appearance {
-				text_color: Some(self.palette.normal.primary),
+				text_color: Some(self.palette.bright.primary),
 				background: Some(Background::Color(self.palette.normal.primary)),
 				border_radius: 0.0,
 				border_width: 0.0,

crates/core/src/theme/button.rs

@@ -51,7 +51,7 @@ impl button::StyleSheet for Theme {
 				..button::Appearance::default()
 			},
 			ButtonStyle::NormalText => button::Appearance {
-				text_color: self.palette.normal.surface,
+				text_color: self.palette.bright.primary,
 				border: Border {
 					color: self.palette.normal.primary,
 					width: 1.0,
@@ -144,14 +144,14 @@ impl button::StyleSheet for Theme {
 				})),
 				text_color: Color {
 					a: 0.50,
-					..self.palette.normal.primary
+					..self.palette.bright.primary
 				},
 				..self.active(style)
 			},
 			ButtonStyle::Primary => button::Appearance {
 				text_color: Color {
 					a: 0.25,
-					..self.palette.normal.surface
+					..self.palette.bright.primary
 				},
 				..self.active(style)
 			},

crates/core/src/theme/container.rs

@@ -46,6 +46,7 @@ impl container::StyleSheet for Theme {
 				..container::Appearance::default()
 			},
 			ContainerStyle::Segmented => container::Appearance {
+				text_color: Some(self.palette.bright.primary),
 				border: Border {
 					color: self.palette.normal.primary,
 					width: 1.0,

crates/core/src/widget/table_row.rs

@@ -150,9 +150,11 @@ where
 		renderer: &Renderer,
 		limits: &layout::Limits,
 	) -> layout::Node {
-		let limits = limits.loose().width(self.height).height(self.height);
-		//.padding();
-		// TODO: Above?
+		let limits = limits
+			.loose()
+			.width(self.width)
+			.height(self.height)
+			.shrink(self.padding);
 
 		let mut content = self
 			.content

src/gui/element/mod.rs

@@ -13,4 +13,4 @@ pub static DEFAULT_SUB_HEADER_FONT_SIZE: u16 = 18;
 pub static DEFAULT_PADDING: f32 = 10.0;
 
 pub static BUTTON_WIDTH: f32 = 84.0;
-pub static BUTTON_HEIGHT: f32 = 16.0;
+pub static BUTTON_HEIGHT: f32 = 20.0;

src/gui/element/wallet/operation/open.rs

@@ -229,12 +229,11 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
 			.align_x(alignment::Horizontal::Center);
 
 	let mut submit_button = Button::new(submit_button_label_container)
+		.on_press(Interaction::WalletOperationOpenViewInteraction(
+			LocalViewInteraction::OpenWallet,
+		))
 		.style(grin_gui_core::theme::ButtonStyle::Primary);
 
-	submit_button = submit_button.on_press(Interaction::WalletOperationOpenViewInteraction(
-		LocalViewInteraction::OpenWallet,
-	));
-
 	let submit_button: Element<Interaction> = submit_button.into();
 
 	let cancel_button_label_container =
@@ -249,20 +248,18 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
 		// &mut state.cancel_button_state,
 		cancel_button_label_container,
 	)
-	.style(grin_gui_core::theme::ButtonStyle::Primary);
-
-	cancel_button = cancel_button.on_press(Interaction::WalletOperationOpenViewInteraction(
+	.on_press(Interaction::WalletOperationOpenViewInteraction(
 		LocalViewInteraction::CancelOpenWallet,
-	));
+	))
+	.style(grin_gui_core::theme::ButtonStyle::Primary);
+	let cancel_button: Element<Interaction> = cancel_button.into();
 
 	// give our buttons a nice double bordered look to match toolbar buttons
-	let submit_button: Element<Interaction> = submit_button.into();
 	let submit_container = Container::new(submit_button.map(Message::Interaction)).padding(1);
 	let submit_container = Container::new(submit_container)
 		.style(grin_gui_core::theme::ContainerStyle::Segmented)
 		.padding(1);
 
-	let cancel_button: Element<Interaction> = cancel_button.into();
 	let cancel_container = Container::new(cancel_button.map(Message::Interaction)).padding(1);
 	let cancel_container = Container::new(cancel_container)
 		.style(grin_gui_core::theme::ContainerStyle::Segmented)

src/gui/element/wallet/setup/wallet_list.rs

@@ -262,7 +262,7 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
 		let wallet_name = Text::new(w.display_name.clone()).size(DEFAULT_FONT_SIZE);
 		let chain_name = Text::new(w.chain_type.shortname()).size(DEFAULT_FONT_SIZE);
 
-		let mut wallet_name_container = Container::new(wallet_name)
+		/*let mut wallet_name_container = Container::new(wallet_name)
 			.style(grin_gui_core::theme::ContainerStyle::HoverableForeground);
 
 		let mut wallet_chain_container = Container::new(chain_name)
@@ -284,11 +284,11 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
 				.style(grin_gui_core::theme::ContainerStyle::HoverableBrightForeground);
 			wallet_directory_container = wallet_directory_container
 				.style(grin_gui_core::theme::ContainerStyle::HoverableBrightForeground);
-		}
+		}*/
 
 		let wallet_row = Row::new()
 			// .push(checkbox)
-			.push(
+			/* .push(
 				Column::new()
 					.push(wallet_name_container)
 					.width(Length::FillPortion(1)),
@@ -302,7 +302,8 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
 				Column::new()
 					.push(wallet_directory_container)
 					.width(Length::FillPortion(3)),
-			);
+			)*/
+			.push(Text::new("arse").size(DEFAULT_FONT_SIZE));
 
 		let mut table_row = TableRow::new(wallet_row)
 			.padding(iced::Padding::from(9))
@@ -329,11 +330,14 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
 			}
 		}
 
+		let table_row: Element<Interaction> = table_row.into();
 		wallet_rows.push(table_row);
 	}
 
 	let wallet_column = Column::new().push(Column::with_children(
-		wallet_rows.into_iter().map(|row| row.into()),
+		wallet_rows
+			.into_iter()
+			.map(|row| row.map(Message::Interaction)),
 	));
 
 	let load_wallet_button_container =
@@ -398,8 +402,7 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain
 
 	let row = Row::new().push(
 		Column::new()
-			// TODO: Find out why this isn't working
-			//.push(table_container)
+			.push(table_container)
 			.push(Space::with_height(Length::Fixed(DEFAULT_PADDING)))
 			.push(button_row),
 	);