← Back to branch summary

~mir-team/mir/ubuntu

« back to all changes in this revision

Viewing changes to src/platform/graphics/display_configuration.cpp

  • Committer: CI Train Bot
  • Author(s): Alberto Aguirre, Brandon Schaefer, Alexandros Frantzis, Daniel van Vugt, Alan Griffiths, Christopher James Halse Rogers
  • Date: 2015-11-05 21:54:14 UTC
  • mfrom: (1160.1793.80 0.17)
  • Revision ID: ci-train-bot@canonical.com-20151105215414-y35b65nzmnmarwj9
Mir 0.17.1 release Fixes: #1492269, #1499039, #1510218, #1511095, #1511538, #1513225

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/platform/graphics/display_configuration.cpp
145
145
 
146
146
    out << "\tscale: " << val.scale << std::endl;
147
147
    out << "\tform factor: " << as_string(val.form_factor) << std::endl;
 
148
    out << "\torientation: " << val.orientation << '\n';
148
149
    out << "}" << std::endl;
149
150
 
150
151
    return out;
219
220
    return !(val1 == val2);
220
221
}
221
222
 
 
223
bool mg::operator==(DisplayConfiguration const& lhs, DisplayConfiguration const& rhs)
 
224
{
 
225
    std::vector<DisplayConfigurationCard> lhs_cards;
 
226
    std::vector<DisplayConfigurationOutput> lhs_outputs;
 
227
 
 
228
    lhs.for_each_card([&lhs_cards](DisplayConfigurationCard const& card) { lhs_cards.emplace_back(card); });
 
229
    lhs.for_each_output([&lhs_outputs](DisplayConfigurationOutput const& output) { lhs_outputs.emplace_back(output); });
 
230
 
 
231
    std::vector<DisplayConfigurationCard> rhs_cards;
 
232
    std::vector<DisplayConfigurationOutput> rhs_outputs;
 
233
 
 
234
    rhs.for_each_card([&rhs_cards](DisplayConfigurationCard const& card) { rhs_cards.emplace_back(card); });
 
235
    rhs.for_each_output([&rhs_outputs](DisplayConfigurationOutput const& output) { rhs_outputs.emplace_back(output); });
 
236
 
 
237
    return lhs_cards == rhs_cards && lhs_outputs == rhs_outputs;
 
238
}
 
239
 
 
240
bool mg::operator!=(DisplayConfiguration const& lhs, DisplayConfiguration const& rhs)
 
241
{
 
242
    return !(lhs == rhs);
 
243
}
 
244
 
222
245
namespace
223
246
{
224
247
mir::geometry::Rectangle extents_of(